Fixes #691 Emoticons issue in 1.8