-upstream/500016-temp-cache-fix.patch
-upstream/508988-inode-sort.patch
-upstream/530661-mandatory-doubledash.patch
-upstream/375530-index-weirdness.patch
-upstream/493719-segfault-imap-close.patch
-upstream/514960-certificate-insecure-algorithm.patch
-upstream/524420-segfault-reconnect-sasl.patch
-upstream/350957-postponed-to-bcc.patch
+# these should all be in 1.5.20
+#upstream/500016-temp-cache-fix.patch
+#upstream/508988-inode-sort.patch
+#upstream/530661-mandatory-doubledash.patch
+#upstream/375530-index-weirdness.patch
+#upstream/493719-segfault-imap-close.patch
+#upstream/514960-certificate-insecure-algorithm.patch
+#upstream/524420-segfault-reconnect-sasl.patch
+#upstream/350957-postponed-to-bcc.patch
+#upstream/502628-attach_charset-doc.patch
+#upstream/504530-stunnel-account_hook-doc.patch
+#upstream/530887-dovecot-imap.patch