Correct various places in smtp.c where the reply string might not have been