Menu Refectoring of Message Module [Feature #2601]