Dev improve email editing performance