Only strip the first ocurrance of the field name
Merge branch 'content_looks_like_field_name_master' of github.com:kjg/mail into kjg-content_looks_like_field_name_master
Update CHANGELOG
Merge branch 'kjg-content_looks_like_field_name_master'