Fix stored messages not being unique to channels