Applied a modified version of Brad Jorsch's patch for "message" with