BugFix 0.1 For Email Popup WIndow