Moved the fields that are shared between the short and long message into the shared area.