Fixed implementation of SMTP grabs