-#upstream/547739-manual-typos.patch
-#upstream/311296-rand-mktemp.patch
-#upstream/573823-imap_internal_date
-#upstream/542344-dont_fold_From_
+upstream/578087-header-strchr.patch
+
+upstream/603288-split-fetches.patch
+upstream/537061-dont-recode-saved-attachments.patch
+upstream/608706-fix-spelling-errors.patch
+upstream/620854-pop3-segfault.patch
+upstream/611412-bts-regexp.patch
+upstream/624058-gnutls-deprecated.patch