Applied the POP3 fix from commit 2897ce7d so smtp_dophase_done() isn't called if smtp_multi_statemach() fails.