Messages - Fixed some usability issues