Slight default Messenger improvement