Rework message sending