updated to reflect rsmtp changes