--- a/Helpviewer/Passwords/PasswordManager.py	Fri Jun 17 18:41:27 2011 +0200
+++ b/Helpviewer/Passwords/PasswordManager.py	Sat Jun 18 20:06:38 2011 +0200
@@ -436,12 +436,13 @@
         if boundary is not None:
             args = self.__extractMultipartQueryItems(data, boundary)
         else:
-            argsUrl = QUrl.fromEncoded(QByteArray("foo://bar.com/?" + data))
+            argsUrl = QUrl.fromEncoded(
+                QByteArray("foo://bar.com/?" + data.replace(b"+", b"%20")))
             encodedArgs = argsUrl.queryItems()
             args = set()
             for arg in encodedArgs:
                 key = arg[0]
-                value = arg[1].replace("+", " ")
+                value = arg[1]
                 args.add((key, value))
         
         # extract the forms