Added log to External-Mail
Added TODO