Tweaked SMTP event definition