Manually merged MessageCompose.java