diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Emojis.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Emojis.java
new file mode 100644
index 000000000..b50d76e7e
--- /dev/null
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Emojis.java
@@ -0,0 +1,50 @@
+/* Copyright 2017 Thomas Schneider
+ *
+ * This file is a part of Mastalab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Mastalab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Mastalab; if not,
+ * see <http://www.gnu.org/licenses>. */
+package fr.gouv.etalab.mastodon.client.Entities;
+
+/**
+ * Created by Thomas on 20/10/2017.
+ */
+
+public class Emojis {
+
+    private String shortcode;
+    private String static_url;
+    private String url;
+
+    public String getShortcode() {
+        return shortcode;
+    }
+
+    public void setShortcode(String shortcode) {
+        this.shortcode = shortcode;
+    }
+
+    public String getStatic_url() {
+        return static_url;
+    }
+
+    public void setStatic_url(String static_url) {
+        this.static_url = static_url;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
index d1b9495e4..01c1584f4 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
@@ -51,6 +51,7 @@ public class Status implements Parcelable {
     private ArrayList<Attachment> media_attachments;
     private List<Status> replies;
     private List<Mention> mentions;
+    private List<Tag> emojis;
     private List<Tag> tags;
     private Application application;
     private String language;
@@ -379,4 +380,12 @@ public class Status implements Parcelable {
     public void setVisible(boolean visible) {
         isVisible = visible;
     }
+
+    public List<Tag> getEmojis() {
+        return emojis;
+    }
+
+    public void setEmojis(List<Tag> emojis) {
+        this.emojis = emojis;
+    }
 }