Mailroom.py final edits