diff --git a/configure.ac b/configure.ac
index 24d8ad2c4..a8d896008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.12.5.4-dev],[http://trac.gajim.org/],[gajim])
+		[0.12.5.5-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
diff --git a/src/common/config.py b/src/common/config.py
index 781b18b56..3153e870e 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -93,8 +93,8 @@ class Config:
 		'inmsgcolor': [ opt_color, '#a40000', _('Incoming nickname color.'), True ],
 		'outmsgcolor': [ opt_color, '#3465a4', _('Outgoing nickname color.'), True ],
 		'inmsgtxtcolor': [ opt_color, '', _('Incoming text color.'), True ],
-		'outmsgtxtcolor': [ opt_color, '#a2a2a2', _('Outgoing text color.'), True ],
-		'statusmsgcolor': [ opt_color, '#73d216', _('Status message text color.'), True ],
+		'outmsgtxtcolor': [ opt_color, '#555753', _('Outgoing text color.'), True ],
+		'statusmsgcolor': [ opt_color, '#4e9a06', _('Status message text color.'), True ],
 		'markedmsgcolor': [ opt_color, '#ff8080', '', True ],
 		'urlmsgcolor': [ opt_color, '#204a87', '', True ],
 		'inmsgfont': [ opt_str, '', _('Incoming nickname font.'), True ],
diff --git a/src/common/defs.py b/src/common/defs.py
index 8bbc982c4..1b4ba22d5 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
 datadir = '../'
 localedir = '../po'
 
-version = '0.12.5.4-dev'
+version = '0.12.5.5-dev'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 96020f11b..75f9c4975 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -208,6 +208,8 @@ class OptionsParser:
 			self.update_config_to_01253()
 		if old < [0, 12, 5, 4] and new >= [0, 12, 5, 4]:
 			self.update_config_to_01254()
+		if old < [0, 12, 5, 5] and new >= [0, 12, 5, 5]:
+			self.update_config_to_01255()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
@@ -764,4 +766,14 @@ class OptionsParser:
 				gajim.config.set(c, vals[c][1])
 		gajim.config.set('version', '0.12.5.4')
 
+	def update_config_to_01254(self):
+		vals = {'statusmsgcolor': ['#73d216', '#4e9a06'],
+			'outmsgtxtcolor': ['#a2a2a2', '#555753']}
+		for c in vals:
+			val = self.old_values[c]
+			if val == vals[c][0]:
+				# We didn't change default value, so update it with new default
+				gajim.config.set(c, vals[c][1])
+		gajim.config.set('version', '0.12.5.5')
+
 # vim: se ts=3: