Merge "Small code change on MessageCompose"