These message additions depend on the message ending with a period to read well.  Are we sure that's the case everywhere?