---
 body.h               |    2 +-
 mh.c                 |    6 +++---
 ncrypt/crypt_gpgme.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

--- body.h
+++ body.h	2017-09-11 11:52:02.449585688 +0000
@@ -37,7 +37,7 @@ struct Body
   struct Parameter *parameter;  /**< parameters of the content-type */
   char *description;            /**< content-description */
   char *form_name;              /**< Content-Disposition form-data name param */
-  long hdr_offset;              /**< offset in stream where the headers begin.
+  LOFF_T hdr_offset;            /**< offset in stream where the headers begin.
                                  * this info is used when invoking metamail,
                                  * where we need to send the headers of the
                                  * attachment */
--- mh.c
+++ mh.c	2017-09-11 11:50:58.466761763 +0000
@@ -1757,9 +1757,9 @@ static int mh_rewrite_message(struct Con
   char newpath[_POSIX_PATH_MAX];
   char partpath[_POSIX_PATH_MAX];
 
-  long old_body_offset = h->content->offset;
-  long old_body_length = h->content->length;
-  long old_hdr_lines = h->lines;
+  LOFF_T old_body_offset = h->content->offset;
+  LOFF_T old_body_length = h->content->length;
+  LOFF_T old_hdr_lines = h->lines;
 
   if ((dest = mx_open_new_message(ctx, h, 0)) == NULL)
     return -1;
--- ncrypt/crypt_gpgme.c
+++ ncrypt/crypt_gpgme.c	2017-09-11 11:52:34.888989382 +0000
@@ -570,7 +570,7 @@ static gpgme_data_t body_to_data_object(
  * Create a GPGME data object from the stream FP but limit the object
  * to LENGTH bytes starting at OFFSET bytes from the beginning of the file.
  */
-static gpgme_data_t file_to_data_object(FILE *fp, long offset, long length)
+static gpgme_data_t file_to_data_object(FILE *fp, LOFF_T offset, long length)
 {
   int err = 0;
   gpgme_data_t data;