diff --git a/external/subpack/libs/uw-imap/patches/003-imap-2007e-overflow.patch b/external/subpack/libs/uw-imap/patches/003-imap-2007e-overflow.patch
new file mode 100644
index 0000000..48e473f
--- /dev/null
+++ b/external/subpack/libs/uw-imap/patches/003-imap-2007e-overflow.patch
@@ -0,0 +1,12 @@
+--- a/src/c-client/rfc822.c
++++ b/src/c-client/rfc822.c
+@@ -384,6 +384,9 @@ void rfc822_parse_content (BODY *body,ST
+ 	if (CHR (bs) == '\012'){/* following LF? */
+ 	  c = SNX (bs); i--;	/* yes, slurp it */
+ 	}
++	if (!i)			/* Make sure we don't get an overflow for */
++	  break;		/* messages ending on \015 (or the following */
++				/* i-- will cause i to be MAXINT. Not good.) */
+       case '\012':		/* at start of a line, start with -- ? */
+ 	if (!(i && i-- && ((c = SNX (bs)) == '-') && i-- &&
+ 	      ((c = SNX (bs)) == '-'))) break;