diff --git a/README.md b/README.md
index eda482ed..6c3fe50c 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,11 @@ Here is a screen shot to get a feel for the UI, but things will probably change.
 
 ![nheko](https://dl.dropboxusercontent.com/s/fw94dkpmr7azvmm/nheko.png)
 
+### Third party
+
+- [Emoji One](http://emojione.com)
+- [Open Sans](https://fonts.google.com/specimen/Open+Sans)
+
 
 ### License
 
diff --git a/include/HistoryViewItem.h b/include/HistoryViewItem.h
index e1ed3374..5b54269e 100644
--- a/include/HistoryViewItem.h
+++ b/include/HistoryViewItem.h
@@ -42,6 +42,8 @@ private:
 	void generateBody(const QString &userid, const QString &color, const QString &body);
 	void generateTimestamp(const QDateTime &time);
 
+	QString replaceEmoji(const QString &body);
+
 	void setupLayout();
 
 	QHBoxLayout *top_layout_;
diff --git a/resources/fonts/EmojiOne/emojione-android.ttf b/resources/fonts/EmojiOne/emojione-android.ttf
new file mode 100644
index 00000000..4cd640d0
Binary files /dev/null and b/resources/fonts/EmojiOne/emojione-android.ttf differ
diff --git a/resources/fonts/LICENSE.txt b/resources/fonts/OpenSans/LICENSE.txt
similarity index 100%
rename from resources/fonts/LICENSE.txt
rename to resources/fonts/OpenSans/LICENSE.txt
diff --git a/resources/fonts/OpenSans-Bold.ttf b/resources/fonts/OpenSans/OpenSans-Bold.ttf
similarity index 100%
rename from resources/fonts/OpenSans-Bold.ttf
rename to resources/fonts/OpenSans/OpenSans-Bold.ttf
diff --git a/resources/fonts/OpenSans-BoldItalic.ttf b/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf
similarity index 100%
rename from resources/fonts/OpenSans-BoldItalic.ttf
rename to resources/fonts/OpenSans/OpenSans-BoldItalic.ttf
diff --git a/resources/fonts/OpenSans-ExtraBold.ttf b/resources/fonts/OpenSans/OpenSans-ExtraBold.ttf
similarity index 100%
rename from resources/fonts/OpenSans-ExtraBold.ttf
rename to resources/fonts/OpenSans/OpenSans-ExtraBold.ttf
diff --git a/resources/fonts/OpenSans-ExtraBoldItalic.ttf b/resources/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf
similarity index 100%
rename from resources/fonts/OpenSans-ExtraBoldItalic.ttf
rename to resources/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf
diff --git a/resources/fonts/OpenSans-Italic.ttf b/resources/fonts/OpenSans/OpenSans-Italic.ttf
similarity index 100%
rename from resources/fonts/OpenSans-Italic.ttf
rename to resources/fonts/OpenSans/OpenSans-Italic.ttf
diff --git a/resources/fonts/OpenSans-Light.ttf b/resources/fonts/OpenSans/OpenSans-Light.ttf
similarity index 100%
rename from resources/fonts/OpenSans-Light.ttf
rename to resources/fonts/OpenSans/OpenSans-Light.ttf
diff --git a/resources/fonts/OpenSans-LightItalic.ttf b/resources/fonts/OpenSans/OpenSans-LightItalic.ttf
similarity index 100%
rename from resources/fonts/OpenSans-LightItalic.ttf
rename to resources/fonts/OpenSans/OpenSans-LightItalic.ttf
diff --git a/resources/fonts/OpenSans-Regular.ttf b/resources/fonts/OpenSans/OpenSans-Regular.ttf
similarity index 100%
rename from resources/fonts/OpenSans-Regular.ttf
rename to resources/fonts/OpenSans/OpenSans-Regular.ttf
diff --git a/resources/fonts/OpenSans-Semibold.ttf b/resources/fonts/OpenSans/OpenSans-Semibold.ttf
similarity index 100%
rename from resources/fonts/OpenSans-Semibold.ttf
rename to resources/fonts/OpenSans/OpenSans-Semibold.ttf
diff --git a/resources/fonts/OpenSans-SemiboldItalic.ttf b/resources/fonts/OpenSans/OpenSans-SemiboldItalic.ttf
similarity index 100%
rename from resources/fonts/OpenSans-SemiboldItalic.ttf
rename to resources/fonts/OpenSans/OpenSans-SemiboldItalic.ttf
diff --git a/resources/res.qrc b/resources/res.qrc
index 0c1479d8..b90e4fe8 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -14,15 +14,17 @@
     </qresource>
 
     <qresource prefix="/fonts">
-        <file>fonts/OpenSans-Light.ttf</file>
-        <file>fonts/OpenSans-LightItalic.ttf</file>
-        <file>fonts/OpenSans-Regular.ttf</file>
-        <file>fonts/OpenSans-Italic.ttf</file>
-        <file>fonts/OpenSans-Bold.ttf</file>
-        <file>fonts/OpenSans-BoldItalic.ttf</file>
-        <file>fonts/OpenSans-Semibold.ttf</file>
-        <file>fonts/OpenSans-SemiboldItalic.ttf</file>
-        <file>fonts/OpenSans-ExtraBold.ttf</file>
-        <file>fonts/OpenSans-ExtraBoldItalic.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Light.ttf</file>
+        <file>fonts/OpenSans/OpenSans-LightItalic.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Regular.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Italic.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Bold.ttf</file>
+        <file>fonts/OpenSans/OpenSans-BoldItalic.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Semibold.ttf</file>
+        <file>fonts/OpenSans/OpenSans-SemiboldItalic.ttf</file>
+        <file>fonts/OpenSans/OpenSans-ExtraBold.ttf</file>
+        <file>fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf</file>
+
+        <file>fonts/EmojiOne/emojione-android.ttf</file>
     </qresource>
 </RCC>
diff --git a/src/HistoryViewItem.cc b/src/HistoryViewItem.cc
index 39965e03..ed00abf9 100644
--- a/src/HistoryViewItem.cc
+++ b/src/HistoryViewItem.cc
@@ -70,7 +70,7 @@ void HistoryViewItem::generateBody(const QString &body)
 		"   </span>"
 		"</body>"
 		"</html>");
-	content_label_->setText(content.arg(body));
+	content_label_->setText(content.arg(replaceEmoji(body)));
 	content_label_->setTextInteractionFlags(Qt::TextSelectableByMouse);
 }
 
@@ -94,7 +94,7 @@ void HistoryViewItem::generateBody(const QString &userid, const QString &color,
 		"   </span>"
 		"</body>"
 		"</html>");
-	content_label_->setText(content.arg(color).arg(sender).arg(body));
+	content_label_->setText(content.arg(color).arg(sender).arg(replaceEmoji(body)));
 	content_label_->setTextInteractionFlags(Qt::TextSelectableByMouse);
 }
 
@@ -137,6 +137,23 @@ void HistoryViewItem::setupLayout()
 	setLayout(top_layout_);
 }
 
+QString HistoryViewItem::replaceEmoji(const QString &body)
+{
+	QString fmtBody = "";
+
+	for (auto &c : body) {
+		auto code = c.unicode();
+
+		// TODO: A map should be used with the unicode codes supported by emoji one
+		if (code > 127)
+			fmtBody += "<span style=\"font-family: Emoji One; font-size: 16px\">" + QString(c) + "</span>";
+		else
+			fmtBody += c;
+	}
+
+	return fmtBody;
+}
+
 HistoryViewItem::~HistoryViewItem()
 {
 }
diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc
index d0deee7b..08aa34eb 100644
--- a/src/TextInputWidget.cc
+++ b/src/TextInputWidget.cc
@@ -24,6 +24,8 @@
 TextInputWidget::TextInputWidget(QWidget *parent)
     : QWidget(parent)
 {
+	setFont(QFont("Emoji One"));
+
 	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 	setCursor(Qt::ArrowCursor);
 	setStyleSheet("background-color: #f8fbfe; height: 45px;");
diff --git a/src/main.cc b/src/main.cc
index d7cb88b3..0a9259c7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -36,6 +36,7 @@ int main(int argc, char *argv[])
 	QFontDatabase::addApplicationFont(":/fonts/OpenSans-SemiboldItalic.ttf");
 	QFontDatabase::addApplicationFont(":/fonts/OpenSans-ExtraBold.ttf");
 	QFontDatabase::addApplicationFont(":/fonts/OpenSans-ExtraBoldItalic.ttf");
+	QFontDatabase::addApplicationFont(":/fonts/emojione-android.ttf");
 
 	QApplication app(argc, argv);