Change the order of the Mail/Message listing to have Mail be afterward.