Better smiley handling
Better message handling