Merge "Fix: failed to send merged email"