diff --git a/js/emoji_util.js b/js/emoji_util.js
index 23c50d32..2d0cb1b8 100644
--- a/js/emoji_util.js
+++ b/js/emoji_util.js
@@ -13,7 +13,7 @@
         }
         this.inits.env = 1;
         this.include_title = true;
-        this.img_sets.apple.path = 'images/emoji/apple/';
+        this.img_sets.apple.path = '/images/emoji/apple/';
         this.replace_mode = 'img';
     };
     EmojiConvertor.prototype.replace_unified = function(str) {
@@ -43,7 +43,7 @@
     emoji.init_colons();
 
     window.emoji_util.parse = function($el) {
-        $el.html(emoji.replace_unified($el.text()));
+        $el.html(emoji.replace_unified($el.html()));
     };
 
 })();
diff --git a/test/index.html b/test/index.html
index 1b079da5..bf1963d1 100644
--- a/test/index.html
+++ b/test/index.html
@@ -32,10 +32,12 @@
   </script>
   <script type='text/x-tmpl-mustache' id='message'>
       {{> avatar }}
-      <div class="bubble">
-          <div class='sender'>{{ sender }}</div>
+      <div class='bubble {{ avatar.color }}'>
+          <div class='sender' dir='auto'>{{ sender }}</div>
           <div class='attachments'></div>
-          <p class="content">{{ message }}</p>
+          <p class='content' dir='auto'>
+            {{ #message }}<span class='body'>{{ message }}</span>{{ /message }}
+          </p>
           <div class='meta'>
             <span class='timestamp' data-timestamp={{ timestamp }}></span>
             <span class='status hide'></span>
diff --git a/test/views/message_view_test.js b/test/views/message_view_test.js
index e88230e7..4cfeb3f7 100644
--- a/test/views/message_view_test.js
+++ b/test/views/message_view_test.js
@@ -58,7 +58,7 @@ describe('MessageView', function() {
     message.set('body', url);
     var view = new Whisper.MessageView({model: message});
     view.render();
-    var link = view.$el.find('.content a');
+    var link = view.$el.find('.body a');
     assert.strictEqual(link.length, 1);
     assert.strictEqual(link.text(), url);
     assert.strictEqual(link.attr('href'), url);
@@ -73,14 +73,14 @@ describe('MessageView', function() {
     assert.strictEqual(view.$el.find('script').length, 0); // should not appear as html
   });
 
-  it('supports twemoji', function() {
+  it('supports emoji', function() {
     message.set('body', 'I \u2764\uFE0F emoji!');
     var view = new Whisper.MessageView({model: message});
     view.render();
     var img = view.$el.find('.content img');
     assert.strictEqual(img.length, 1);
-    assert.strictEqual(img.attr('src'), '/images/twemoji/16x16/2764.png');
-    assert.strictEqual(img.attr('alt'), '\u2764\uFE0F');
+    assert.strictEqual(img.attr('src'), '/images/emoji/apple/2764.png');
+    assert.strictEqual(img.attr('title'), ':heart:');
     assert.strictEqual(img.attr('class'), 'emoji');
   });
 });