Fix #150 again by moving towards a more RFC 2822-compliant definition of valid syntax