Merge "MAP: Remove extra line feed in Message Listing object"