Gh 1376

looks good.  tested locally, ran regression and visually inspected the messages.