Fix up bug for cropping messages