diff --git a/src/config.py b/src/config.py
index a73fe151d..7f44db774 100644
--- a/src/config.py
+++ b/src/config.py
@@ -122,7 +122,8 @@ class PreferencesWindow:
 		emoticons_combobox.set_model(model)
 		l = []
 		for dir in emoticons_list:
-			if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir)):
+			if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir)) \
+			and not os.path.isdir(os.path.join(gajim.MY_EMOTS_PATH, dir)) :
 				continue
 			if dir != '.svn':
 				l.append(dir)
diff --git a/src/gajim.py b/src/gajim.py
index eb0d3ac85..c9dd2fa87 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1657,7 +1657,7 @@ class Interface:
 		if not emot_theme:
 			return
 
-		#initialize emoticons dictionary and unique images list
+		# initialize emoticons dictionary and unique images list
 		self.emoticons_images = list()
 		self.emoticons = dict()