Updated after updates to librsmtp