WIP: join threads
rescue on missing message_ids, still bad join thread matching
Merge branch 'sup-for-two' into maildir-root