adjust smiley handling and add appropriate tests, fixes #2064

Merge request reports

Loading