Issue #2289063 by larowlan, andypost | Berdir: Change contact message entity to behave more like a normal entity.