diff -u claws-mail-extra-plugins-3.5.0/debian/changelog claws-mail-extra-plugins-3.5.0/debian/changelog
--- claws-mail-extra-plugins-3.5.0/debian/changelog
+++ claws-mail-extra-plugins-3.5.0/debian/changelog
@@ -1,3 +1,18 @@
+claws-mail-extra-plugins (3.5.0-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #260958):
+    - explicitely depend on libcurl4-gnutls-dev instead of relying on it
+      being dragged in by libetpan-dev.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Sun, 24 Aug 2008 16:22:53 -0500
+
+claws-mail-extra-plugins (3.5.0-3) unstable; urgency=high
+
+  * patches/fix_newmail_crash.patch, patches/series
+  - Added upstream fix for newmail plugin crash (Closes: #495300)
+
+ -- Ricardo Mones <mones@debian.org>  Mon, 18 Aug 2008 14:23:35 +0200
+
 claws-mail-extra-plugins (3.5.0-2ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable, remaining changes:
only in patch2:
unchanged:
--- claws-mail-extra-plugins-3.5.0.orig/debian/patches/fix_newmail_crash.patch
+++ claws-mail-extra-plugins-3.5.0/debian/patches/fix_newmail_crash.patch
@@ -0,0 +1,21 @@
+diff -u -r1.1.2.16 -r1.1.2.18
+--- ./newmail-0.0.12/src/newmail.c	2007/07/23 18:10:13	1.1.2.16
++++ ./newmail-0.0.12/src/newmail.c	2008/07/04 09:20:22	1.1.2.18
+@@ -61,7 +61,7 @@
+ 	"From:\t%s\n"
+ 	"To:\t%s\n"
+ 	"Cc:\t%s\n"
+-	"Size:\t%ld\n"
++	"Size:\t%jd\n"
+ 	"Path:\t%s\n"
+ 	"Message:\t%d\n"
+ 	"Folder:\t%s\n",
+@@ -70,7 +70,7 @@
+ 	    defstr (msginfo->from),
+ 	    defstr (msginfo->to),
+ 	    defstr (msginfo->cc),
+-	    msginfo->size,
++	    (intmax_t) msginfo->size,
+ 	    defstr (procmsg_get_message_file_path (msginfo)),
+ 	    msginfo->msgnum,
+ 	    tof ? defstr (tof->name) : "(null)");
only in patch2:
unchanged:
--- claws-mail-extra-plugins-3.5.0.orig/debian/patches/series
+++ claws-mail-extra-plugins-3.5.0/debian/patches/series
@@ -0,0 +1 @@
+fix_newmail_crash.patch