Refactored to EditMessageActivity