diff --git a/bower.json b/bower.json
index 825f111..ccf0b7f 100644
--- a/bower.json
+++ b/bower.json
@@ -26,6 +26,7 @@
     "moment": "^2.12.0",
     "mousetrap": "^1.4.10",
     "ngAutocomplete": "^1.0.0",
-    "ng-range-slider": "^0.2.0"
+    "ng-range-slider": "^0.2.0",
+    "twemoji": "^2.0.5"
   }
 }
diff --git a/desktop-app/css/app.css b/desktop-app/css/app.css
index a5c8444..c2027ca 100644
--- a/desktop-app/css/app.css
+++ b/desktop-app/css/app.css
@@ -741,6 +741,11 @@ ul.from-to li input {
     outline: none;
 }
 
+.emoji {
+  width: 20px;
+  padding-left: 5px;
+}
+
 
 /* Templates - settings */
 
diff --git a/desktop-app/index.html b/desktop-app/index.html
index 7d6947f..69787bb 100644
--- a/desktop-app/index.html
+++ b/desktop-app/index.html
@@ -6,15 +6,14 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
   <title>Tinder Desktop</title>
   <meta name="description" content="A cross-platform desktop Tinder client">
-
+  
   <link rel="stylesheet" href="css/normalize.min.css"/>
   <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
   <link rel="stylesheet" href="css/font-awesome.min.css">
   <link rel="stylesheet" href="css/app.css"/>
   <link rel="stylesheet" href="css/sweet-alert.css"/>
-
+  
   <script src="js/error_handler.js"></script>
-
   <script src="js/vendor/angular.min.js"></script>
   <script src="js/vendor/angular-sanitize.min.js"></script>
   <script src="js/vendor/angular-translate.min.js"></script>
@@ -26,7 +25,7 @@
   <script src="js/vendor/moment-with-locales.min.js"></script>
   <script>window.jQuery = window.$ = module.exports;</script>
   <script src="js/vendor/mousetrap.min.js"></script>
-
+  <script src="js/vendor/twemoji.js"></script>
   <script src="js/tinder-desktop.api.js"></script>
   <script src="js/tinder-desktop.common.js"></script>
   <script src="js/tinder-desktop.controls.js"></script>
diff --git a/desktop-app/js/tinder-desktop.common.js b/desktop-app/js/tinder-desktop.common.js
index cc9dc12..5cf6c7e 100644
--- a/desktop-app/js/tinder-desktop.common.js
+++ b/desktop-app/js/tinder-desktop.common.js
@@ -34,4 +34,11 @@
       return moment(time).format('L HH:mm');
     };
   });
-})();
+  
+  module.filter('twemoji', function() {
+    return function(string) {
+      return twemoji.parse(string);
+    };  
+  });
+  
+})();
\ No newline at end of file
diff --git a/desktop-app/templates/messages.html b/desktop-app/templates/messages.html
index 7ea5eda..3033148 100644
--- a/desktop-app/templates/messages.html
+++ b/desktop-app/templates/messages.html
@@ -54,7 +54,7 @@
                 {{message.sentDate | timeToLocalized}}
               </div>
               <div ng-if="message.text"
-                ng-bind-html="message.text"></div>
+                ng-bind-html="message.text | twemoji"></div>
             </div>
           </div>
           <div ng-repeat-end class="messages-in-chat" scroll-to-last></div>
@@ -71,4 +71,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/desktop-app/templates/profile.html b/desktop-app/templates/profile.html
index 30380a1..810956a 100644
--- a/desktop-app/templates/profile.html
+++ b/desktop-app/templates/profile.html
@@ -22,7 +22,7 @@ <h3 class="status fader">{{user.distance_mi | distanceToUnits}} {{'PROFILE.AWAY'
           	    {{job.title.name}} {{job.company && job.title ? ('PROFILE.AT' | translate) : ''}} {{job.company.name}}
               </i>
             </p>
-            <p ng-show="user.bio" class="bio fader" ng-bind-html="user.bio"></p>
+            <p ng-if="user.bio" class="bio fader" ng-bind-html="user.bio | twemoji"></p>
           </div>
           <div class="small-photos fader">
             <div ng-repeat="photo in user.photos">
@@ -34,4 +34,4 @@ <h3 class="status fader">{{user.distance_mi | distanceToUnits}} {{'PROFILE.AWAY'
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/desktop-app/templates/swipe.html b/desktop-app/templates/swipe.html
index d7ec8e6..259a822 100644
--- a/desktop-app/templates/swipe.html
+++ b/desktop-app/templates/swipe.html
@@ -36,7 +36,7 @@ <h3 class="status fader">{{allPeople[peopleIndex].distance_mi | distanceToUnits}
                 {{job.title.name}} {{job.company && job.title ? ('SWIPE.AT' | translate) : ''}} {{job.company.name}}
                 </i>
               </p>
-              <p ng-show="allPeople[peopleIndex].bio" class="bio fader">{{ allPeople[peopleIndex].bio }}</p>
+              <p ng-if="allPeople[peopleIndex].bio" ng-bind-html="allPeople[peopleIndex].bio | twemoji" class="bio fader"></p>
             </div>
             <!-- small inactive photos -->
             <div class="small-photos fader">
@@ -50,4 +50,4 @@ <h3 class="status fader">{{allPeople[peopleIndex].distance_mi | distanceToUnits}
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index c4ff859..6fd7381 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -24,7 +24,8 @@ var PATHS = {
     'bower_components/moment/min/moment-with-locales.min.js',
     'bower_components/mousetrap/mousetrap.min.js',
     'bower_components/ngAutocomplete/src/ngAutocomplete.js',
-    'bower_components/ng-range-slider/dist/ng-range-slider.min.js'
+    'bower_components/ng-range-slider/dist/ng-range-slider.min.js',
+    'bower_components/twemoji/twemoji.js'
   ],
   stylesheets: [
     'bower_components/font-awesome/css/font-awesome.min.css'