Nov 6 2013

Merge the email encoding fix.