Fixed: Message positioning bug