diff --git a/offlineimap/folder/Maildir.py b/offlineimap/folder/Maildir.py
index 23f48b4..3d6fd62 100644
--- a/offlineimap/folder/Maildir.py
+++ b/offlineimap/folder/Maildir.py
@@ -104,6 +104,8 @@ class MaildirFolder(BaseFolder):
         oldest_time_utc -= oldest_time_today_seconds
 
         timestampmatch = re_timestampmatch.search(messagename)
+        if not timestampmatch:
+            return True
         timestampstr = timestampmatch.group()
         timestamplong = long(timestampstr)
         if(timestamplong < oldest_time_utc):
diff --git a/offlineimap/imaputil.py b/offlineimap/imaputil.py
index fe69b7a..231fb14 100644
--- a/offlineimap/imaputil.py
+++ b/offlineimap/imaputil.py
@@ -145,6 +145,10 @@ def imapsplit(imapstring):
         elif workstr[0] == '"':
             # quoted fragments '"...\"..."'
             m = quotere.match(workstr)
+            if not m:
+                raise ValueError ("failed to parse "
+                  "quoted component %s " % str(workstr) + \
+                  "while working with %s" % str(imapstring))
             retval.append(m.group('quote'))
             workstr = m.group('rest')
         else: