[The Knotty Celt]

While the changes I described work for all the standard order notification e-mails, it does not do the same for notifications created by the Order Messages module or other Modules which access the Order class.