Remove duplicate parameters and rename correctly
Rename to inbox_row_common_spec
Move message fields to common spec