properly parse out email labels to avoid encoding comma in the wrong pla...

...ce