Fixed space issue on messages