Fix message submission