mail-merge: usability improvements