added smtp_events fields and missing msg fields