Removed old Code, added Fail Popup at mail