Rollback 5d6c786413924a0cd4d45cf0c618b0ab0086f385 which broke more email special characters than it fixed