LPS-39591 - Fix Mail Portlet after migration to Alloy 2.0

Some of these changes were done by Iliyan Peychev, but I added some additional changes and messed up the commit history.  After I resent the commit to bchan, he asked me to send you these changes to review.  Can you review this and send it to bchan?