Revisions to mailroom2.py