removed complex construct from Mailbox class
removed unused getter methods
little refactorings