Move thread-generating bits to MailRoom junk drawer
Update TODO
Add delivery options to config