Remove moved messsages (but not unmoved ones)

1 files changed, 2 insertions, 1 deletions

diff --git a/pieni-to-mail-archive b/pieni-to-mail-archive
index 97a0a4c..0550f65 100755
--- a/pieni-to-mail-archive
+++ b/pieni-to-mail-archive
@@ -66,7 +66,7 @@ class PieniToMailArchive(cliapp.Application):
     def archive_mails_in_maildir(self, maildir):
         md = mailbox.Maildir(maildir, factory=None)
         parser = email.parser.Parser()
-        for msg in md.itervalues():
+        for key, msg in md.iteritems():
             y, m, d = self.date_of(msg)
             
             filename = os.path.join(self.settings['mbox-dir'], '%04d.mbox' % y)
@@ -83,6 +83,7 @@ class PieniToMailArchive(cliapp.Application):
                 self.mbox = mailbox.mbox(filename, create=True)
                 self.mbox_filename = filename
             self.mbox.add(msg)
+            md.remove(key)
         
     def date_of(self, msg):
         year = mon = day = 0