Fixing conflicts in MessagesActivity