[mailbox] cleaned up, added tests #561