Only the first half of this hack need be installed.
There is no point trimming the version that goes into the mailqueue, as when the mailqueue is executed each mail is passed to vb_send_mail anyway, which is where the first half of the hack already does the trimming
Sure the second trim() would simply be ineffective, but that's reason enough to not bother telling people to put it in