Fix message alignment