Fix mail-combine-fields