diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 67df24f..0d83f8c 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -4,6 +4,8 @@ offlineimap (3.99.19) unstable; urgency=low
     folder.  Per [complete.org #67], when cachemessagelist() was called
     on an object that was cached from a previous run, it would not
     re-issue the select().
+  * Applied patch from Joerg Wendland <joergland@debian.org> to use
+    APPENDUID result from mail servers that provide it.  Closes: #198772.
 
  -- John Goerzen <jgoerzen@complete.org>  Mon,  2 Jun 2003 07:04:53 -0500
 
diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/offlineimap/head/offlineimap/folder/IMAP.py
index b96a0f1..2381c57 100644
--- a/offlineimap/head/offlineimap/folder/IMAP.py
+++ b/offlineimap/head/offlineimap/folder/IMAP.py
@@ -142,6 +142,9 @@ class IMAPFolder(BaseFolder):
         return leader + newline + trailer
 
     def savemessage_searchforheader(self, imapobj, headername, headervalue):
+        if imapobj.untagged_responses.has_key('APPENDUID'):
+            return long(imapobj.untagged_responses['APPENDUID'][0].split(' ')[1])
+
         ui = UIBase.getglobalui()
         ui.debug('imap', 'savemessage_searchforheader called for %s: %s' % \
                  (headername, headervalue))