---
 crypt-gpgme.c |    2 +-
 mh.c          |    6 +++---
 mutt.h        |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

--- crypt-gpgme.c
+++ crypt-gpgme.c	2016-06-13 08:59:27.309566323 +0000
@@ -496,7 +496,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;
--- mh.c
+++ mh.c	2016-06-13 08:59:27.309566323 +0000
@@ -1619,9 +1619,9 @@ static int mh_rewrite_message (CONTEXT *
   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;
--- mutt.h
+++ mutt.h	2016-06-13 08:59:27.309566323 +0000
@@ -729,7 +729,7 @@ typedef struct body
   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