Attempt to get around Gmail RFC violation