Combine Name and EMail parts for S/MIME Uids

If the EMail of a userid is empty but the next userid
has an email merge these two userids together in a single
row in the UID table.

This is very common as GPGME parses the Name and EMail
into different UserIDs.

GnuPG-Bug-Id: 3611