Stop smileys removing adjacent spaces

Change-Id: I6d771c315fe6146a80698d12d90a0081f2926361