Index: Lib/mailbox.py =================================================================== --- Lib/mailbox.py (revision 63867) +++ Lib/mailbox.py (working copy) @@ -910,7 +910,7 @@ _unlock_file(f) finally: f.close() - for name, key_list in self.get_sequences(): + for name, key_list in self.get_sequences().iteritems(): if key in key_list: msg.add_sequence(name) return msg @@ -1023,6 +1023,9 @@ try: all_keys = set(self.keys()) for line in f: + line = line.strip() + if not line: + break try: name, contents = line.split(':') keys = set()