Merge pull request #7951 from KevinGrandon/bug_835507_lazy_email

Bug 835507 - lazy load email resources(cherry picked from commit 886b27d9d77f7c3a6fd05631e45cd63e8bbe69e9)
(cherry picked from commit f6ecea2a9ebf9e946eda38928df8cb802209a26b)