It seems yesterday's code workaround didn't work with the older messages for
some reason, albeit it did work with all of my attempts. So I discarded it and
I had to come out with another try. And here it is.
This seems to do the trick right now (program/steps/mail/compose.inc):