LILY-453: Improved email compose when replying