New structure for email encryption and improved UI