diff --git a/data/iconsets/transports/mrim/16x16/away.png b/data/iconsets/transports/mrim/16x16/away.png
new file mode 100644
index 000000000..aff4b712b
Binary files /dev/null and b/data/iconsets/transports/mrim/16x16/away.png differ
diff --git a/data/iconsets/transports/mrim/16x16/chat.png b/data/iconsets/transports/mrim/16x16/chat.png
new file mode 100644
index 000000000..a6fe20a06
Binary files /dev/null and b/data/iconsets/transports/mrim/16x16/chat.png differ
diff --git a/data/iconsets/transports/mrim/16x16/dnd.png b/data/iconsets/transports/mrim/16x16/dnd.png
new file mode 100644
index 000000000..5e0d9fa67
Binary files /dev/null and b/data/iconsets/transports/mrim/16x16/dnd.png differ
diff --git a/data/iconsets/transports/mrim/16x16/not_in_roster.png b/data/iconsets/transports/mrim/16x16/not_in_roster.png
new file mode 100644
index 000000000..5396d4531
Binary files /dev/null and b/data/iconsets/transports/mrim/16x16/not_in_roster.png differ
diff --git a/data/iconsets/transports/mrim/16x16/offline.png b/data/iconsets/transports/mrim/16x16/offline.png
new file mode 100644
index 000000000..b31cb8323
Binary files /dev/null and b/data/iconsets/transports/mrim/16x16/offline.png differ
diff --git a/data/iconsets/transports/mrim/16x16/online.png b/data/iconsets/transports/mrim/16x16/online.png
new file mode 100644
index 000000000..2ca9e6e7b
Binary files /dev/null and b/data/iconsets/transports/mrim/16x16/online.png differ
diff --git a/data/iconsets/transports/mrim/16x16/xa.png b/data/iconsets/transports/mrim/16x16/xa.png
new file mode 100644
index 000000000..b31cb8323
Binary files /dev/null and b/data/iconsets/transports/mrim/16x16/xa.png differ
diff --git a/data/iconsets/transports/mrim/32x32/away.png b/data/iconsets/transports/mrim/32x32/away.png
new file mode 100644
index 000000000..387ff4622
Binary files /dev/null and b/data/iconsets/transports/mrim/32x32/away.png differ
diff --git a/data/iconsets/transports/mrim/32x32/chat.png b/data/iconsets/transports/mrim/32x32/chat.png
new file mode 100644
index 000000000..9d503e3dd
Binary files /dev/null and b/data/iconsets/transports/mrim/32x32/chat.png differ
diff --git a/data/iconsets/transports/mrim/32x32/dnd.png b/data/iconsets/transports/mrim/32x32/dnd.png
new file mode 100644
index 000000000..40cb5ea0f
Binary files /dev/null and b/data/iconsets/transports/mrim/32x32/dnd.png differ
diff --git a/data/iconsets/transports/mrim/32x32/not_in_roster.png b/data/iconsets/transports/mrim/32x32/not_in_roster.png
new file mode 100644
index 000000000..5ea7a920e
Binary files /dev/null and b/data/iconsets/transports/mrim/32x32/not_in_roster.png differ
diff --git a/data/iconsets/transports/mrim/32x32/offline.png b/data/iconsets/transports/mrim/32x32/offline.png
new file mode 100644
index 000000000..e7f9fe5df
Binary files /dev/null and b/data/iconsets/transports/mrim/32x32/offline.png differ
diff --git a/data/iconsets/transports/mrim/32x32/online.png b/data/iconsets/transports/mrim/32x32/online.png
new file mode 100644
index 000000000..772c80ecc
Binary files /dev/null and b/data/iconsets/transports/mrim/32x32/online.png differ
diff --git a/data/iconsets/transports/mrim/32x32/xa.png b/data/iconsets/transports/mrim/32x32/xa.png
new file mode 100644
index 000000000..e7f9fe5df
Binary files /dev/null and b/data/iconsets/transports/mrim/32x32/xa.png differ
diff --git a/data/iconsets/transports/mrim/48x48/offline.png b/data/iconsets/transports/mrim/48x48/offline.png
new file mode 100644
index 000000000..0a378b1d7
Binary files /dev/null and b/data/iconsets/transports/mrim/48x48/offline.png differ
diff --git a/data/iconsets/transports/mrim/48x48/online.png b/data/iconsets/transports/mrim/48x48/online.png
new file mode 100644
index 000000000..bbf1a704c
Binary files /dev/null and b/data/iconsets/transports/mrim/48x48/online.png differ
diff --git a/src/common/gajim.py b/src/common/gajim.py
index 3beabc5b1..bc9228f23 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -323,7 +323,8 @@ def get_transport_name_from_jid(jid, use_config_setting = True):
 		# now we support both 'icq.' and 'icq' but not icqsucks.org
 		host = host_splitted[0]
 
-	if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo'):
+	if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo',
+	'mrim'):
 		return host
 	elif host == 'gg':
 		return 'gadu-gadu'
diff --git a/src/common/logger.py b/src/common/logger.py
index 55301be5c..0e3a8c97c 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -83,7 +83,8 @@ class Constants:
 			self.TYPE_NEWMAIL,
 			self.TYPE_RSS,
 			self.TYPE_WEATHER,
-		) = range(13)
+			self.TYPE_MRIM,
+		) = range(14)
 
 constants = Constants()
 
@@ -290,6 +291,8 @@ class Logger:
 			return constants.TYPE_RSS
 		if type_ == 'weather':
 			return constants.TYPE_WEATHER
+		if type_ == 'mrim':
+			return constants.TYPE_MRIM
 		return None
 
 	def convert_api_values_to_human_transport_type(self, type_id):
@@ -320,6 +323,8 @@ class Logger:
 			return 'rss'
 		if type_id == constants.TYPE_WEATHER:
 			return 'weather'
+		if type_id == constants.TYPE_MRIM:
+			return 'mrim'
 
 	def commit_to_db(self, values, write_unread = False):
 		sql = 'INSERT INTO logs (jid_id, contact_name, time, kind, show, message, subject) VALUES (?, ?, ?, ?, ?, ?, ?)'
diff --git a/src/disco.py b/src/disco.py
index faa320e5c..d25007807 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -103,6 +103,8 @@ def _gen_agent_type_info():
 		('gateway', 'smtp'):			(False, 'mail.png'),
 		('gateway', 'yahoo'):		(False, 'yahoo.png'),
 		('_jid', 'yahoo'):			(False, 'yahoo.png'),
+		('gateway', 'mrim'):			(False, 'mrim.png'),
+		('_jid', 'mrim'):				(False, 'mrim.png'),
 	}
 
 # Category type to "human-readable" description string, and sort priority