FIX correctly parse labels in emails

It was parsing will+label@localhost to label@localhost. Not good.