diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c
index 25d5534..dde41c2 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -343,6 +343,30 @@ proceed:
 		obex_object_set_io_flags(mas, G_IO_IN, 0);
 }
 
+static void get_message_cb(void *session, int err, gboolean fmore,
+	const char *chunk, void *user_data)
+{
+	struct mas_session *mas = user_data;
+
+	DBG("");
+
+	if (err < 0 && err != -EAGAIN) {
+		obex_object_set_io_flags(mas, G_IO_ERR, err);
+		return;
+	}
+
+	if (!chunk) {
+		mas->finished = TRUE;
+		goto proceed;
+	}
+
+	g_string_append(mas->buffer, chunk);
+
+proceed:
+	if (err != -EAGAIN)
+		obex_object_set_io_flags(mas, G_IO_IN, 0);
+}
+
 static void get_folder_listing_cb(void *session, int err, uint16_t size,
 					const char *name, void *user_data)
 {
@@ -455,6 +479,31 @@ static void *msg_listing_open(const char *name, int oflag, mode_t mode,
 		return mas;
 }
 
+static void *message_open(const char *name, int oflag, mode_t mode,
+				void *driver_data, size_t *size, int *err)
+{
+	struct mas_session *mas = driver_data;
+
+	DBG("");
+
+	if (oflag != O_RDONLY) {
+		DBG("Message pushing unsupported");
+		*err = -EINVAL;
+
+		return NULL;
+	}
+
+	*err = messages_get_message(mas->backend_data, name, 0,
+			get_message_cb, mas);
+
+	mas->buffer = g_string_new("");
+
+	if (*err < 0)
+		return NULL;
+	else
+		return mas;
+}
+
 static void *any_open(const char *name, int oflag, mode_t mode,
 				void *driver_data, size_t *size, int *err)
 {
@@ -529,7 +578,7 @@ static struct obex_mime_type_driver mime_message = {
 	.target = MAS_TARGET,
 	.target_size = TARGET_SIZE,
 	.mimetype = "x-bt/message",
-	.open = any_open,
+	.open = message_open,
 	.close = any_close,
 	.read = any_read,
 	.write = any_write,
diff --git a/obexd/plugins/messages-dummy.c b/obexd/plugins/messages-dummy.c
index b0b74d7..9295864 100644
--- a/obexd/plugins/messages-dummy.c
+++ b/obexd/plugins/messages-dummy.c
@@ -163,8 +163,7 @@ int messages_get_messages_listing(void *session,
 int messages_get_message(void *session,
 		const char *handle,
 		unsigned long flags,
-		void (*callback)(void *session, int err, gboolean fmore,
-			const char *chunk, void *user_data),
+		messages_get_message_cb callback,
 		void *user_data)
 {
 	return -EINVAL;
diff --git a/obexd/plugins/messages.h b/obexd/plugins/messages.h
index f931eb4..9e0b091 100644
--- a/obexd/plugins/messages.h
+++ b/obexd/plugins/messages.h
@@ -258,11 +258,13 @@ int messages_get_messages_listing(void *session,
  *
  * Callback allows for returning bMessage in chunks.
  */
+typedef void (*messages_get_message_cb)(void *session, int err, gboolean fmore,
+	const char *chunk, void *user_data);
+
 int messages_get_message(void *session,
 		const char *handle,
 		unsigned long flags,
-		void (*callback)(void *session, int err, gboolean fmore,
-			const char *chunk, void *user_data),
+		messages_get_message_cb callback,
 		void *user_data);
 
 /* Aborts currently pending request.