Adding Contact id back to message view, fixes #6517