Merge MOG's first serious patch (new message patch) (bug #2071)