diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c
index 38e40c5..bec9a5a 100644
--- a/camel/camel-block-file.c
+++ b/camel/camel-block-file.c
@@ -1006,7 +1006,7 @@ CamelKeyFile *
 camel_key_file_new(const gchar *path, gint flags, const gchar version[8])
 {
 	CamelKeyFile *kf;
-	off_t last;
+	goffset last;
 	gint err;
 
 	d(printf("New key file '%s'\n", path));
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index 4a9e2da..1fa4007 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -176,7 +176,7 @@ struct _CamelKeyFile {
 	FILE *fp;
 	gchar *path;
 	gint flags;
-	off_t last;
+	goffset last;
 };
 
 struct _CamelKeyFileClass {
diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 2a3968b..8690f20 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -285,7 +285,7 @@ camel_disco_diary_replay (CamelDiscoDiary *diary,
                           GError **error)
 {
 	guint32 action;
-	off_t size;
+	goffset size;
 	gdouble pc;
 	GError *local_error = NULL;
 
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 528b83d..ee16619 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -1230,7 +1230,7 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver,
 	gint i = 0;
 	struct stat st;
 	gint status;
-	off_t last = 0;
+	goffset last = 0;
 	gint ret = -1;
 
 	fd = g_open (mbox, O_RDONLY|O_BINARY, 0);
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 7092bb4..38931cf 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -2653,7 +2653,7 @@ camel_folder_summary_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser
 	gchar *buffer;
 	gsize len;
 	struct _CamelFolderSummaryPrivate *p = CAMEL_FOLDER_SUMMARY_GET_PRIVATE(s);
-	off_t start;
+	goffset start;
 	CamelIndexName *name = NULL;
 
 	/* should this check the parser is in the right state, or assume it is?? */
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 5d340e5..8aa1a84 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -87,7 +87,7 @@ struct _header_scan_state {
 
 	gint atleast;
 
-	off_t seek;		/* current offset to start of buffer */
+	goffset seek;		/* current offset to start of buffer */
 	gint unstep;		/* how many states to 'unstep' (repeat the current state) */
 
 	guint midline:1;		/* are we mid-line interrupted? */
@@ -95,11 +95,11 @@ struct _header_scan_state {
 	guint scan_pre_from:1;	/* do we return pre-from data? */
 	guint eof:1;		/* reached eof? */
 
-	off_t start_of_from;	/* where from started */
-	off_t start_of_boundary; /* where the last boundary started */
-	off_t start_of_headers;	/* where headers started from the last scan */
+	goffset start_of_from;	/* where from started */
+	goffset start_of_boundary; /* where the last boundary started */
+	goffset start_of_headers;	/* where headers started from the last scan */
 
-	off_t header_start;	/* start of last header, or -1 */
+	goffset header_start;	/* start of last header, or -1 */
 
 	/* filters to apply to all content before output */
 	gint filterid;		/* id of next filter */
@@ -150,8 +150,8 @@ static void folder_scan_close(struct _header_scan_state *s);
 static struct _header_scan_stack *folder_scan_content(struct _header_scan_state *s, gint *lastone, gchar **data, gsize *length);
 static struct _header_scan_stack *folder_scan_header(struct _header_scan_state *s, gint *lastone);
 static gint folder_scan_skip_line(struct _header_scan_state *s, GByteArray *save);
-static off_t folder_seek(struct _header_scan_state *s, off_t offset, gint whence);
-static off_t folder_tell(struct _header_scan_state *s);
+static goffset folder_seek(struct _header_scan_state *s, goffset offset, gint whence);
+static goffset folder_tell(struct _header_scan_state *s);
 static gint folder_read(struct _header_scan_state *s);
 static void folder_push_part(struct _header_scan_state *s, struct _header_scan_stack *h);
 
@@ -705,7 +705,7 @@ camel_mime_parser_read (CamelMimeParser *parser,
  *
  * Since: 2.22
  **/
-off_t
+goffset
 camel_mime_parser_tell (CamelMimeParser *parser)
 {
 	struct _header_scan_state *s = _PRIVATE (parser);
@@ -726,7 +726,7 @@ camel_mime_parser_tell (CamelMimeParser *parser)
  *
  * Since: 2.22
  **/
-off_t
+goffset
 camel_mime_parser_tell_start_headers (CamelMimeParser *parser)
 {
 	struct _header_scan_state *s = _PRIVATE (parser);
@@ -746,7 +746,7 @@ camel_mime_parser_tell_start_headers (CamelMimeParser *parser)
  *
  * Since: 2.22
  **/
-off_t
+goffset
 camel_mime_parser_tell_start_from (CamelMimeParser *parser)
 {
 	struct _header_scan_state *s = _PRIVATE (parser);
@@ -766,7 +766,7 @@ camel_mime_parser_tell_start_from (CamelMimeParser *parser)
  *
  * Since: 2.22
  **/
-off_t
+goffset
 camel_mime_parser_tell_start_boundary(CamelMimeParser *parser)
 {
 	struct _header_scan_state *s = _PRIVATE (parser);
@@ -793,8 +793,8 @@ camel_mime_parser_tell_start_boundary(CamelMimeParser *parser)
  *
  * Since: 2.22
  **/
-off_t
-camel_mime_parser_seek(CamelMimeParser *parser, off_t offset, gint whence)
+goffset
+camel_mime_parser_seek(CamelMimeParser *parser, goffset offset, gint whence)
 {
 	struct _header_scan_state *s = _PRIVATE (parser);
 
@@ -945,7 +945,7 @@ folder_read(struct _header_scan_state *s)
 }
 
 /* return the current absolute position of the data pointer */
-static off_t
+static goffset
 folder_tell(struct _header_scan_state *s)
 {
 	return s->seek + (s->inptr - s->inbuf);
@@ -955,10 +955,10 @@ folder_tell(struct _header_scan_state *s)
   need some way to prime the parser state, so this actually works for
   other than top-level messages
 */
-static off_t
-folder_seek(struct _header_scan_state *s, off_t offset, gint whence)
+static goffset
+folder_seek(struct _header_scan_state *s, goffset offset, gint whence)
 {
-	off_t newoffset;
+	goffset newoffset;
 
 	if (s->stream) {
 		if (CAMEL_IS_SEEKABLE_STREAM(s->stream)) {
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index 916824c..73321e6 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -150,12 +150,12 @@ void camel_mime_parser_filter_remove (CamelMimeParser *m, gint id);
 /* these should be used with caution, because the state will not
    track the seeked position */
 /* FIXME: something to bootstrap the state? */
-off_t camel_mime_parser_tell (CamelMimeParser *parser);
-off_t camel_mime_parser_seek (CamelMimeParser *parser, off_t offset, gint whence);
+goffset camel_mime_parser_tell (CamelMimeParser *parser);
+goffset camel_mime_parser_seek (CamelMimeParser *parser, goffset offset, gint whence);
 
-off_t camel_mime_parser_tell_start_headers (CamelMimeParser *parser);
-off_t camel_mime_parser_tell_start_from (CamelMimeParser *parser);
-off_t camel_mime_parser_tell_start_boundary(CamelMimeParser *parser);
+goffset camel_mime_parser_tell_start_headers (CamelMimeParser *parser);
+goffset camel_mime_parser_tell_start_from (CamelMimeParser *parser);
+goffset camel_mime_parser_tell_start_boundary(CamelMimeParser *parser);
 
 G_END_DECLS
 
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
index fa546ba..e89b604 100644
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.c
@@ -56,7 +56,7 @@ static void movemail_external (const gchar *source, const gchar *dest,
 #endif
 
 #ifdef HAVE_BROKEN_SPOOL
-static gint camel_movemail_copy_filter(gint fromfd, gint tofd, off_t start, gsize bytes, CamelMimeFilter *filter);
+static gint camel_movemail_copy_filter(gint fromfd, gint tofd, goffset start, gsize bytes, CamelMimeFilter *filter);
 static gint camel_movemail_solaris (gint oldsfd, gint dfd, GError **error);
 #else
 /* these could probably be exposed as a utility? (but only mbox needs it) */
@@ -64,7 +64,7 @@ static gint camel_movemail_copy_file(gint sfd, gint dfd, GError **error);
 #endif
 
 #if 0
-static gint camel_movemail_copy(gint fromfd, gint tofd, off_t start, gsize bytes);
+static gint camel_movemail_copy(gint fromfd, gint tofd, goffset start, gsize bytes);
 #endif
 
 /**
@@ -298,7 +298,7 @@ camel_movemail_copy_file (gint sfd,
 
 #if 0
 static gint
-camel_movemail_copy(gint fromfd, gint tofd, off_t start, gsize bytes)
+camel_movemail_copy(gint fromfd, gint tofd, goffset start, gsize bytes)
 {
         gchar buffer[4096];
         gint written = 0;
@@ -350,7 +350,7 @@ camel_movemail_copy(gint fromfd, gint tofd, off_t start, gsize bytes)
 
 #ifdef HAVE_BROKEN_SPOOL
 static gint
-camel_movemail_copy_filter(gint fromfd, gint tofd, off_t start, gsize bytes, CamelMimeFilter *filter)
+camel_movemail_copy_filter(gint fromfd, gint tofd, goffset start, gsize bytes, CamelMimeFilter *filter)
 {
         gchar buffer[4096+PRE_SIZE];
         gint written = 0;
@@ -498,7 +498,7 @@ camel_movemail_solaris (gint oldsfd,
 			const gchar *cl;
 			gint length;
 			gint start, body;
-			off_t newpos;
+			goffset newpos;
 
 			ret = 0;
 
diff --git a/camel/camel-multipart-signed.h b/camel/camel-multipart-signed.h
index b118274..06a9308 100644
--- a/camel/camel-multipart-signed.h
+++ b/camel/camel-multipart-signed.h
@@ -91,8 +91,8 @@ struct _CamelMultipartSigned
 	gchar *micalg;
 
 	/* offset pointers of start of boundary in content object */
-	off_t start1, end1;
-	off_t start2, end2;
+	goffset start1, end1;
+	goffset start2, end2;
 };
 
 typedef struct {
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index 3e56fee..66954cf 100644
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.c
@@ -43,7 +43,7 @@ seekable_stream_reset (CamelStream *stream,
 		CAMEL_STREAM_SET, error);
 }
 
-static off_t
+static goffset
 seekable_stream_tell (CamelSeekableStream *stream)
 {
 	return stream->position;
@@ -51,8 +51,8 @@ seekable_stream_tell (CamelSeekableStream *stream)
 
 static gint
 seekable_stream_set_bounds (CamelSeekableStream *stream,
-                            off_t start,
-                            off_t end,
+                            goffset start,
+                            goffset end,
                             GError **error)
 {
 	/* store the bounds */
@@ -108,14 +108,14 @@ camel_seekable_stream_init (CamelSeekableStream *stream)
  *
  * Returns: new position, %-1 if operation failed.
  **/
-off_t
+goffset
 camel_seekable_stream_seek (CamelSeekableStream *stream,
-                            off_t offset,
+                            goffset offset,
                             CamelStreamSeekPolicy policy,
                             GError **error)
 {
 	CamelSeekableStreamClass *class;
-	off_t new_offset;
+	goffset new_offset;
 
 	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
 
@@ -136,7 +136,7 @@ camel_seekable_stream_seek (CamelSeekableStream *stream,
  *
  * Returns: the current position of the stream.
  **/
-off_t
+goffset
 camel_seekable_stream_tell (CamelSeekableStream *stream)
 {
 	CamelSeekableStreamClass *class;
@@ -164,8 +164,8 @@ camel_seekable_stream_tell (CamelSeekableStream *stream)
  **/
 gint
 camel_seekable_stream_set_bounds (CamelSeekableStream *stream,
-                                  off_t start,
-                                  off_t end,
+                                  goffset start,
+                                  goffset end,
                                   GError **error)
 {
 	CamelSeekableStreamClass *class;
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index 1cf2801..ae49cc4 100644
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.h
@@ -68,34 +68,34 @@ typedef enum {
 struct _CamelSeekableStream {
 	CamelStream parent;
 
-	off_t position;		/* current postion in the stream */
-	off_t bound_start;	/* first valid position */
-	off_t bound_end;	/* first invalid position */
+	goffset position;		/* current postion in the stream */
+	goffset bound_start;	/* first valid position */
+	goffset bound_end;	/* first invalid position */
 };
 
 struct _CamelSeekableStreamClass {
 	CamelStreamClass parent_class;
 
-	off_t		(*seek)			(CamelSeekableStream *stream,
-						 off_t offset,
+	goffset		(*seek)			(CamelSeekableStream *stream,
+						 goffset offset,
 						 CamelStreamSeekPolicy policy,
 						 GError **error);
-	off_t		(*tell)			(CamelSeekableStream *stream);
+	goffset		(*tell)			(CamelSeekableStream *stream);
 	gint		(*set_bounds)		(CamelSeekableStream *stream,
-						 off_t start,
-						 off_t end,
+						 goffset start,
+						 goffset end,
 						 GError **error);
 };
 
 GType		camel_seekable_stream_get_type	(void);
-off_t		camel_seekable_stream_seek	(CamelSeekableStream *stream,
-						 off_t offset,
+goffset		camel_seekable_stream_seek	(CamelSeekableStream *stream,
+						 goffset offset,
 						 CamelStreamSeekPolicy policy,
 						 GError **error);
-off_t		camel_seekable_stream_tell	(CamelSeekableStream *stream);
+goffset		camel_seekable_stream_tell	(CamelSeekableStream *stream);
 gint		camel_seekable_stream_set_bounds(CamelSeekableStream *stream,
-						 off_t start,
-						 off_t end,
+						 goffset start,
+						 goffset end,
 						 GError **error);
 
 G_END_DECLS
diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
index 9a229f4..1bd7188 100644
--- a/camel/camel-seekable-substream.c
+++ b/camel/camel-seekable-substream.c
@@ -39,7 +39,7 @@ seekable_substream_parent_reset (CamelSeekableSubstream *seekable_substream,
 		return TRUE;
 
 	return camel_seekable_stream_seek (
-		parent, (off_t) seekable_stream->position,
+		parent, seekable_stream->position,
 		CAMEL_STREAM_SET, NULL) == seekable_stream->position;
 }
 
@@ -181,15 +181,15 @@ seekable_substream_eos (CamelStream *stream)
 	return eos;
 }
 
-static off_t
+static goffset
 seekable_substream_seek (CamelSeekableStream *seekable_stream,
-                         off_t offset,
+                         goffset offset,
                          CamelStreamSeekPolicy policy,
                          GError **error)
 {
 	CamelStream *stream;
 	CamelSeekableSubstream *seekable_substream;
-	off_t real_offset = 0;
+	goffset real_offset = 0;
 
 	stream = CAMEL_STREAM (seekable_stream);
 	seekable_substream = CAMEL_SEEKABLE_SUBSTREAM (seekable_stream);
@@ -276,7 +276,7 @@ camel_seekable_substream_init (CamelSeekableSubstream *seekable_substream)
  * Returns: the substream
  **/
 CamelStream *
-camel_seekable_substream_new(CamelSeekableStream *parent_stream, off_t start, off_t end)
+camel_seekable_substream_new(CamelSeekableStream *parent_stream, goffset start, goffset end)
 {
 	CamelSeekableSubstream *seekable_substream;
 
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 877f939..3e6e31a 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -71,7 +71,7 @@ GType camel_seekable_substream_get_type (void);
 /* public methods */
 
 /* obtain a new seekable substream */
-CamelStream *camel_seekable_substream_new(CamelSeekableStream *parent_stream, off_t start, off_t end);
+CamelStream *camel_seekable_substream_new(CamelSeekableStream *parent_stream, goffset start, goffset end);
 
 G_END_DECLS
 
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 8813b12..3dc5602 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -149,14 +149,14 @@ stream_fs_close (CamelStream *stream,
 	return 0;
 }
 
-static off_t
+static goffset
 stream_fs_seek (CamelSeekableStream *stream,
-                off_t offset,
+                goffset offset,
                 CamelStreamSeekPolicy policy,
                 GError **error)
 {
 	CamelStreamFsPrivate *priv;
-	off_t real = 0;
+	goffset real = 0;
 
 	priv = CAMEL_STREAM_FS_GET_PRIVATE (stream);
 
@@ -252,7 +252,7 @@ camel_stream_fs_new_with_fd (gint fd)
 {
 	CamelStreamFsPrivate *priv;
 	CamelStream *stream;
-	off_t offset;
+	goffset offset;
 
 	if (fd == -1)
 		return NULL;
@@ -282,8 +282,8 @@ camel_stream_fs_new_with_fd (gint fd)
  **/
 CamelStream *
 camel_stream_fs_new_with_fd_and_bounds (gint fd,
-                                        off_t start,
-                                        off_t end,
+                                        goffset start,
+                                        goffset end,
                                         GError **error)
 {
 	CamelStream *stream;
@@ -344,8 +344,8 @@ CamelStream *
 camel_stream_fs_new_with_name_and_bounds (const gchar *name,
                                           gint flags,
                                           mode_t mode,
-                                          off_t start,
-                                          off_t end,
+                                          goffset start,
+                                          goffset end,
                                           GError **error)
 {
 	CamelStream *stream;
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index 3250713..e210a50 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -79,14 +79,14 @@ CamelStream *	camel_stream_fs_new_with_name_and_bounds
 						(const gchar *name,
 						 gint flags,
 						 mode_t mode,
-						 off_t start,
-						 off_t end,
+						 goffset start,
+						 goffset end,
 						 GError **error);
 CamelStream *	camel_stream_fs_new_with_fd	(gint fd);
 CamelStream *	camel_stream_fs_new_with_fd_and_bounds
 						(gint fd,
-						 off_t start,
-						 off_t end,
+						 goffset start,
+						 goffset end,
 						 GError **error);
 gint		camel_stream_fs_get_fd		(CamelStreamFs *stream);
 
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index 37c4524..40544e6 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -148,14 +148,14 @@ stream_mem_eos (CamelStream *stream)
 	return priv->buffer->len <= seekable_stream->position;
 }
 
-static off_t
+static goffset
 stream_mem_seek (CamelSeekableStream *stream,
-                 off_t offset,
+                 goffset offset,
                  CamelStreamSeekPolicy policy,
                  GError **error)
 {
 	CamelStreamMemPrivate *priv;
-	off_t position;
+	goffset position;
 
 	priv = CAMEL_STREAM_MEM_GET_PRIVATE (stream);
 
diff --git a/camel/camel-url-scanner.h b/camel/camel-url-scanner.h
index 2a1d6b4..1fcf04d 100644
--- a/camel/camel-url-scanner.h
+++ b/camel/camel-url-scanner.h
@@ -35,8 +35,8 @@ G_BEGIN_DECLS
 typedef struct {
 	const gchar *pattern;
 	const gchar *prefix;
-	off_t um_so;
-	off_t um_eo;
+	goffset um_so;
+	goffset um_eo;
 } urlmatch_t;
 
 typedef gboolean (*CamelUrlScanFunc) (const gchar *in, const gchar *pos, const gchar *inend, urlmatch_t *match);
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index dbe2e0b..f16a5fb 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -305,7 +305,7 @@ mbox_get_filename (CamelFolder *folder, const gchar *uid, GError **error)
 {
 	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
 	CamelMboxMessageInfo *info;
-	off_t frompos;
+	goffset frompos;
 	gchar *filename = NULL;
 
 	d(printf("Getting message %s\n", uid));
@@ -356,7 +356,7 @@ mbox_get_message(CamelFolder *folder, const gchar * uid, GError **error)
 	CamelMimeParser *parser = NULL;
 	gint fd, retval;
 	gint retried = FALSE;
-	off_t frompos;
+	goffset frompos;
 
 	d(printf("Getting message %s\n", uid));
 
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 14856b0..2367cc1 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -443,7 +443,7 @@ message_info_to_db(CamelFolderSummary *s, CamelMessageInfo *info)
 
 /* like summary_rebuild, but also do changeinfo stuff (if supplied) */
 static gint
-summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *changeinfo, GError **error)
+summary_update(CamelLocalSummary *cls, goffset offset, CamelFolderChangeInfo *changeinfo, GError **error)
 {
 	gint i, count;
 	CamelFolderSummary *s = (CamelFolderSummary *)cls;
@@ -455,7 +455,7 @@ summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *chan
 	gint fd;
 	gint ok = 0;
 	struct stat st;
-	off_t size = 0;
+	goffset size = 0;
 	GSList *del = NULL;
 
 	d(printf("Calling summary update, from pos %d\n", (gint)offset));
@@ -513,7 +513,7 @@ summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *chan
 
 	while (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) {
 		CamelMessageInfo *info;
-		off_t pc = camel_mime_parser_tell_start_from (mp) + 1;
+		goffset pc = camel_mime_parser_tell_start_from (mp) + 1;
 
 		camel_operation_progress (NULL, (gint) (((gfloat) pc / size) * 100));
 
@@ -791,7 +791,7 @@ mbox_summary_sync_quick(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChan
 	gchar *xevnew, *xevtmp;
 	const gchar *xev;
 	gint len;
-	off_t lastpos;
+	goffset lastpos;
 	GPtrArray *summary = NULL;
 
 	d(printf("Performing quick summary sync\n"));
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index 5c0c9a6..ceb4087 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -120,7 +120,7 @@ spool_summary_sync_full (CamelMboxSummary *cls,
 	gint fd = -1, fdout = -1;
 	gchar tmpname[64] = { '\0' };
 	gchar *buffer, *p;
-	off_t spoollen, outlen;
+	goffset spoollen, outlen;
 	gint size, sizeout;
 	struct stat st;
 	guint32 flags = (expunge?1:0);
diff --git a/camel/tests/lib/streams.c b/camel/tests/lib/streams.c
index c12876c..6165f70 100644
--- a/camel/tests/lib/streams.c
+++ b/camel/tests/lib/streams.c
@@ -18,7 +18,7 @@ static gchar testbuf[10240];
 void
 test_stream_seekable_writepart(CamelSeekableStream *s)
 {
-	off_t end;
+	goffset end;
 	gint i;
 
 	push("seekable stream test, writing ");
@@ -53,7 +53,7 @@ test_stream_seekable_writepart(CamelSeekableStream *s)
 void
 test_stream_seekable_readpart(CamelSeekableStream *s)
 {
-	off_t off, new, end;
+	goffset off, new, end;
 	gint i, j;
 
 	push("seekable stream test, re-reading");
diff --git a/camel/tests/stream/test3.c b/camel/tests/stream/test3.c
index 3196315..ca13d12 100644
--- a/camel/tests/stream/test3.c
+++ b/camel/tests/stream/test3.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 struct {
-	off_t lower, upper;
+	goffset lower, upper;
 } ranges[] = {
 	{ 3, 10241 },
 	{ 0, 1024 },
diff --git a/configure.ac b/configure.ac
index b4e0dc3..f5ef844 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ LIBEGROUPWISE_CURRENT=13
 LIBEGROUPWISE_REVISION=1
 LIBEGROUPWISE_AGE=0
 
-LIBCAMEL_CURRENT=18
+LIBCAMEL_CURRENT=19
 LIBCAMEL_REVISION=0
 LIBCAMEL_AGE=0
 
