diff --git a/.gitignore b/.gitignore
index 285013f..494d8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,4 @@ Makefile.in
 /src/matrix-message-emote.c
 /src/matrix-message-notice.c
 /src/matrix-message-file.c
+/src/matrix-message-image.c
diff --git a/src/Makefile.am b/src/Makefile.am
index cd1abba..fe010a5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,7 @@ libmatrix_glib_0_0_la_VALA_SOURCES = \
 	matrix-message-emote.vala \
 	matrix-message-notice.vala \
 	matrix-message-file.vala \
+	matrix-message-image.vala \
 	$(NULL)
 
 AM_CPPFLAGS += \
diff --git a/src/matrix-event-types.c b/src/matrix-event-types.c
index 415b419..eb8cb82 100644
--- a/src/matrix-event-types.c
+++ b/src/matrix-event-types.c
@@ -234,6 +234,9 @@ matrix_event_types_ctor(void)
     matrix_message_register_type("m.file",
                                  MATRIX_MESSAGE_TYPE_FILE,
                                  NULL);
+    matrix_message_register_type("m.image",
+                                 MATRIX_MESSAGE_TYPE_IMAGE,
+                                 NULL);
 }
 
 void
diff --git a/src/matrix-message-image.vala b/src/matrix-message-image.vala
new file mode 100644
index 0000000..4f081d3
--- /dev/null
+++ b/src/matrix-message-image.vala
@@ -0,0 +1,102 @@
+/*
+ * This file is part of matrix-glib-sdk
+ *
+ * matrix-glib-sdk is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * matrix-glib-sdk 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with matrix-glib-sdk. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Class to hold a m.image message
+ *
+ * This message represents a single image and an optional thumbnail.
+ */
+public class Matrix.Message.Image : Matrix.Message.Base {
+    /**
+     * The URL to the image.
+     */
+    public string? url { get; set; default = null; }
+
+    /**
+     * The URL to the thumbnail of the image.
+     */
+    public string? thumbnail_url { get; set; default = null; }
+
+    /**
+     * Metadata about the image referred to in `url`.
+     */
+    public ImageInfo? info { get; set; default = null; }
+
+    /**
+     * Metadata about the image referred to in `thumbnail_url`.
+     */
+    public ImageInfo? thumbnail_info { get; set; default = null; }
+
+    protected override void
+    from_json(Json.Node json_data)
+        throws Matrix.Error
+    {
+        var root = json_data.get_object();
+        Json.Node? node;
+
+        if ((node = root.get_member("url")) != null) {
+            _url = node.get_string();
+        } else if (Config.DEBUG) {
+            warning("url is missing from a m.image message");
+        }
+
+        if ((node = root.get_member("info")) != null) {
+            _info = ImageInfo();
+            _info.set_from_json(node);
+        }
+
+        if ((node = root.get_member("thumbnail_url")) != null) {
+            _thumbnail_url = node.get_string();
+        }
+
+        if ((node = root.get_member("thumbnail_info")) != null) {
+            _thumbnail_info = ImageInfo();
+            _thumbnail_info.set_from_json(node);
+        }
+
+        base.from_json(json_data);
+    }
+
+    protected override void
+    to_json(Json.Node json_data)
+        throws Matrix.Error
+    {
+        if (_url == null) {
+            throw new Matrix.Error.INCOMPLETE(
+                    "Won't generate a m.image message without url");
+        }
+
+        var root = json_data.get_object();
+
+        root.set_string_member("url", _url);
+
+        if (_info != null) {
+            root.set_member("info", _info.get_json_node());
+        }
+
+        if (_thumbnail_url != null) {
+            root.set_string_member("thumbnail_url", _thumbnail_url);
+        }
+
+        if (_thumbnail_info != null) {
+            root.set_member("thumbnail_info", _thumbnail_info.get_json_node());
+        }
+
+        base.to_json(json_data);
+    }
+}