[IMP] Merge mail_compose_message_views