Merge "Fix reply/forward to start the compose activity"