Undo the increment if the email sending is delayed (#56)

Undo the increment if the email sending is delayed (#56) #38