Correction
Merge https://github.com/commoncriteria/emailclient