Fixed the email overlapping issue
Merge pull request #2557 from ten24/feature-4-emailOverlayIssue

Fixed the email overlapping issue