Fixing up queue for unsent messages