More bug fixes for Mailgame