SMTP changes and Cut Report

Added some SMTP improvements
Cut report only to show marks