Make sending messages functional again