diff --git a/syncplay/client.py b/syncplay/client.py
index abd1b2a..4df083a 100644
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -543,7 +543,7 @@ class SyncplayUserlist(object):
             
     def __addUserWithFileToList(self, rooms, user):
         currentPosition = utils.formatTime(user.lastPosition)
-        file_key = '\'{}\' ({}/{})'.format(user.file['name'], currentPosition, utils.formatTime(user.file['duration']))
+        file_key = u'\'{}\' ({}/{})'.format(user.file['name'], currentPosition, utils.formatTime(user.file['duration']))
         if (not rooms[user.room].has_key(file_key)):
             rooms[user.room][file_key] = {}
         rooms[user.room][file_key][user.username] = user
diff --git a/syncplay/messages.py b/syncplay/messages.py
index e7a059a..160ef69 100644
--- a/syncplay/messages.py
+++ b/syncplay/messages.py
@@ -176,8 +176,8 @@ messages = {
 def getMessage(locale, type_):
     if(messages.has_key(locale)):
         if(messages[locale].has_key(type_)):
-            return messages[locale][type_]
+            return unicode(messages[locale][type_])
     if(messages["en"].has_key(type_)):
-        return messages["en"][type_]
+        return unicode(messages["en"][type_])
     else:
         raise KeyError()
diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py
index 9d9310b..9bc9c39 100644
--- a/syncplay/players/mpc.py
+++ b/syncplay/players/mpc.py
@@ -79,7 +79,6 @@ class MpcHcApi:
         self.__listener.SendCommand(self.CMD_SETSPEED, unicode(rate))
 
     def sendOsd(self, message, MsgPos=constants.MPC_OSD_POSITION, DurationMs=(constants.OSD_DURATION*1000)):
-        message = message.decode()
         class __OSDDATASTRUCT(ctypes.Structure):
             _fields_ = [
                 ('nMsgPos', ctypes.c_int32),
diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py
index 249f472..acc6dd2 100644
--- a/syncplay/ui/ConfigurationGetter.py
+++ b/syncplay/ui/ConfigurationGetter.py
@@ -178,7 +178,7 @@ class ConfigurationGetter(object):
 
     def __wasOptionChanged(self, parser, section, option):
         if (parser.has_option(section, option)):
-            if (parser.get(section, option) != str(self._config[option])):
+            if (parser.get(section, option) != unicode(self._config[option])):
                 return True
         else:
             return True
@@ -196,7 +196,7 @@ class ConfigurationGetter(object):
             for option in options:
                 if(self.__wasOptionChanged(parser, section, option)):
                     changed = True
-                parser.set(section, option, str(self._config[option]))
+                parser.set(section, option, unicode(self._config[option]))
         if(changed):
             parser.write(codecs.open(iniPath, "wb", "utf_8_sig"))
         
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index cedec7a..3151f60 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -14,7 +14,7 @@ class MainDialog(QtGui.QDialog):
         return None
 
     def showMessage(self, message, noTimestamp=False):
-        message = message.encode(sys.stdout.encoding, 'replace')
+        message = unicode(message)
         message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;")
         message = message.replace("\n", "<br />")
         if(noTimestamp):
@@ -23,7 +23,7 @@ class MainDialog(QtGui.QDialog):
             self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + "<br />")
     
     def showListMessage(self, message):
-        message = message.encode(sys.stdout.encoding, 'replace')
+        message = unicode(message)
         message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;")
         message = message.replace("\t", "&nbsp;"*4)
         self._listBuffer += message + "<br />"