Fix emoticons: Was not upgraded to use promises