diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index 91f1f17..38a90b0 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -31,3 +31,5 @@ Bug Fixes
 * Fixed MachineUI to urlencode() output lines again, rather than
   outputting multi-line items. It's ugly as hell, but it had been that
   way for years.
+
+* Fixed Maildir regression "flagmatchre" not found. (regressed in 6.5.0)
diff --git a/offlineimap/folder/Maildir.py b/offlineimap/folder/Maildir.py
index 973bc92..938d47b 100644
--- a/offlineimap/folder/Maildir.py
+++ b/offlineimap/folder/Maildir.py
@@ -298,7 +298,7 @@ class MaildirFolder(BaseFolder):
             # Flags have actually changed, construct new filename
             # Strip off existing infostring (preserving small letter flags that
             # dovecot uses)
-            infomatch = self.flagmatchre.search(filename)
+            infomatch = self.re_flagmatch.search(filename)
             if infomatch:
                 filename = filename[:-len(infomatch.group())] #strip off
             infostr = '%s2,%s' % (self.infosep, ''.join(sorted(flags)))