Reset state properly#4

dcormier wants to merge 3 commits intomailhog:mastermailhog/smtp:masterfrom

dcormier:dc/rsetdcormier/smtp:dc/rsetCopy head branch name to clipboard