applying patch from Paul Seyfert correcting copy-paste errrors in messages