diff --git a/src/common/config.py b/src/common/config.py
index 86e3adc0c..3bb4ac943 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -134,7 +134,7 @@ class Config:
 		'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')],
 		'show_roster_on_startup': [opt_bool, True],
 		'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')],
-		'version': [ opt_str, '0.10.0.1' ], # which version created the config
+		'version': [ opt_str, '0.10.1.2' ], # which version created the config
 		'search_engine': [opt_str, 'http://www.google.com/search?&q=%s&sourceid=gajim'],
 		'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")],
 		'always_english_wikipedia': [opt_bool, False],
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 15b1f3179..ef426a1d5 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -144,6 +144,9 @@ class OptionsParser:
 			self.update_config_09_to_010()
 		if old < [0, 10, 1, 1] and new >= [0, 10, 1, 1]:
 			self.update_config_to_01011()
+		if old < [0, 10, 1, 2] and new >= [0, 10, 1, 2]:
+			self.update_config_to_01012()
+	
 		gajim.config.set('version', new_version)
 	
 	def update_config_x_to_09(self):
@@ -263,3 +266,8 @@ class OptionsParser:
 		if self.old_values['print_status_in_muc'] in (True, False):
 			gajim.config.set('print_status_in_muc', 'in_and_out')
 		gajim.config.set('version', '0.10.1.1')
+
+	def update_config_to_01012(self):
+		if self.old_values['emoticons_theme'] == 'Disabled':
+			gajim.config.set('emoticons_theme', '')
+		gajim.config.set('version', '0.10.1.2')
diff --git a/src/config.py b/src/config.py
index 3a88e4d35..2ae68cc98 100644
--- a/src/config.py
+++ b/src/config.py
@@ -124,7 +124,7 @@ class PreferencesWindow:
 		for dir in emoticons_list:
 			if dir != '.svn':
 				l.append(dir)
-		l.append('Disabled')
+		l.append(_('Disabled'))
 		for i in xrange(len(l)):
 			model.append([l[i]])
 			if gajim.config.get('emoticons_theme') == l[i]: