Quick messages fix