Changing code due to API changes in emoticons module