Messages:queue bug fix