diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py
index ef3ea71c..0ee031dc 100644
--- a/src/controller/buffersController.py
+++ b/src/controller/buffersController.py
@@ -106,9 +106,9 @@ class bufferController(object):
   if tweet.message.get_response() == widgetUtils.OK:
    text = tweet.message.get_text()
    if tweet.image == None:
-    call_threaded(buffer.session.api_call, call_name="update_status", _sound="tweet_send.ogg", status=text)
+    call_threaded(self.session.api_call, call_name="update_status", status=text)
    else:
-    call_threaded(buffer.session.api_call, call_name="update_status_with_media", _sound="tweet_send.ogg", status=text, media=tweet.image)
+    call_threaded(self.session.api_call, call_name="update_status_with_media", status=text, media=tweet.image)
 
 class accountPanel(bufferController):
  def __init__(self, parent, name, account):
@@ -228,7 +228,7 @@ class baseBufferController(bufferController):
    users = utils.get_all_users(tweet, self.session.db)
   dm = messages.dm(self.session, _(u"Direct message to %s") % (screen_name,), _(u"New direct message"), users)
   if dm.message.get_response() == widgetUtils.OK:
-   call_threaded(self.session.api_call, call_name="send_direct_message", _sound="dm_sent.ogg", text=dm.message.get_text(), screen_name=dm.message.get("cb"))
+   call_threaded(self.session.api_call, call_name="send_direct_message", text=dm.message.get_text(), screen_name=dm.message.get("cb"))
 
  def retweet(self, *args, **kwargs):
   tweet = self.get_right_tweet()
diff --git a/src/mysc/localization.py b/src/mysc/localization.py
index c308af24..624bd8f5 100644
--- a/src/mysc/localization.py
+++ b/src/mysc/localization.py
@@ -1,7 +1,10 @@
-import gettext_windows, os
+import os
+import languageHandler
 
 def get(rootFolder):
- defaultLocale = gettext_windows.get_language()[0][:2]
+ defaultLocale = languageHandler.curLang
+ if len(defaultLocale) > 2:
+  defaultLocale = defaultLocale[:2]
  if os.path.exists(rootFolder+"/"+defaultLocale):
   return defaultLocale
  else:
diff --git a/src/mysc/thread_utils.py b/src/mysc/thread_utils.py
index 74af8092..29aecf4d 100644
--- a/src/mysc/thread_utils.py
+++ b/src/mysc/thread_utils.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import threading
 import wx
+from pubsub import pub
 from twython import TwythonRateLimitError
 import time
 
@@ -19,3 +20,14 @@ def call_threaded(func, *args, **kwargs):
  thread.daemon = True
  thread.start()
  return thread
+
+def stream_threaded(func, *args, **kwargs):
+ def new_func(*a, **k):
+  try:
+   func(*a, **k)
+  except:
+   pub.sendMessage("streamError")
+ thread = threading.Thread(target=new_func, args=args, kwargs=kwargs)
+ thread.daemon = True
+ thread.start()
+ return thread
\ No newline at end of file