diff --git a/plugins/bigassmessage.py b/plugins/bigassmessage.py
index 8e324b7..6e5645e 100644
--- a/plugins/bigassmessage.py
+++ b/plugins/bigassmessage.py
@@ -1,25 +1,26 @@
 from util import hook
 from lxml import etree
-import urllib2
+import urllib
 
 host = 'http://bigassmessage.com'
 
+
 @hook.command
 def bam(inp):
-	
-	if not inp:
-		return 'you forgot something'
-	
-	inp = inp.strip().replace(' ', '+')
-	path = '/dsx_BAM/boe.php?action=saveMsg&theStyle=magic&theMessage=' + inp
-	url = host + path
-	
-	try:
-		response = etree.parse(urllib2.urlopen(url))
-		status = response.xpath('//status/text()')[0]
-		if (status == 'ok'):
-			return host + '/' + response.xpath('//msgid/text()')[0]
-		else:
-			return response.xpath('//message/text()')[0]
-	except:
-		pass
+
+    if not inp:
+        return 'you forgot something'
+
+    inp = urllib.quote_plus(inp)
+    path = '/dsx_BAM/boe.php?action=saveMsg&theStyle=magic&theMessage=' + inp
+    url = host + path
+
+    try:
+        response = etree.parse(url)
+        status = response.xpath('//status/text()')[0]
+        if status == 'ok':
+            return host + '/' + response.xpath('//msgid/text()')[0]
+        else:
+            return response.xpath('//message/text()')[0]
+    except:
+        pass