Fixing behavior of message/compose/ slightly