diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index 116693c253..2eb4a96783 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -226,10 +226,12 @@
                   jsp="/jsp/dashboards/dashlets/opensearch.jsp" />
             <dashlet id="doclist-webscript" label="Document List" description="Document List WebScript"
                   jsp="/jsp/dashboards/dashlets/doclist-webscript.jsp" />
+            <dashlet id="myspaces-webscript" label="My Spaces List" description="My Spaces WebScript"
+                  jsp="/jsp/dashboards/dashlets/myspaces-webscript.jsp" />
             <dashlet id="mytasks-webscript" label="My Tasks" description="My Tasks WebScript"
                   jsp="/jsp/dashboards/dashlets/mytasks-webscript.jsp" />
             <dashlet id="mywebforms-webscript" label="My Web Forms" description="My Web Forms WebScript"
-                  jsp="/jsp/dashboards/dashlets/mywebforms-webscript.jsp" />                  
+                  jsp="/jsp/dashboards/dashlets/mywebforms-webscript.jsp" /> 
          </dashlets>
          <!-- set true allow the Guest user to configure the dashboard view - false by default -->
          <allow-guest-config>false</allow-guest-config>
diff --git a/source/java/org/alfresco/web/scripts/jsf/WebScriptJSFRequest.java b/source/java/org/alfresco/web/scripts/jsf/WebScriptJSFRequest.java
index 4c3535d9ea..e8d29f0521 100644
--- a/source/java/org/alfresco/web/scripts/jsf/WebScriptJSFRequest.java
+++ b/source/java/org/alfresco/web/scripts/jsf/WebScriptJSFRequest.java
@@ -24,6 +24,10 @@
  */
 package org.alfresco.web.scripts.jsf;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.web.scripts.WebScriptMatch;
 import org.alfresco.web.scripts.WebScriptURLRequest;
 
@@ -50,6 +54,18 @@ public class WebScriptJSFRequest extends WebScriptURLRequest
    public WebScriptJSFRequest(String[] scriptUrlParts, WebScriptMatch match)
    {
        super(scriptUrlParts, match);
+       // decode url args (as they would be if this was a servlet)
+       try
+       {
+          for (String name : this.queryArgs.keySet())
+          {
+             this.queryArgs.put(name, URLDecoder.decode(this.queryArgs.get(name), "UTF-8"));
+          }
+       }
+       catch (UnsupportedEncodingException e)
+       {
+          throw new AlfrescoRuntimeException("Unable to decode UTF-8 url!", e);
+       }
    }
 
    /* (non-Javadoc)
diff --git a/source/web/WEB-INF/portlet.xml b/source/web/WEB-INF/portlet.xml
index 203e7243ea..de7926e495 100644
--- a/source/web/WEB-INF/portlet.xml
+++ b/source/web/WEB-INF/portlet.xml
@@ -63,6 +63,27 @@
             <short-title>Document List</short-title>
         </portlet-info>
     </portlet>
+    
+    <portlet>
+        <description>My Spaces</description>
+        <portlet-name>AlfrescoMySpaces</portlet-name>
+        <portlet-class>org.alfresco.web.scripts.portlet.WebScriptPortlet</portlet-class>
+        
+        <init-param>
+           <name>scriptUrl</name>
+           <value>/alfresco/service/myspaces</value>
+        </init-param>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        
+        <portlet-info>
+            <title>My Spaces</title>
+            <short-title>My Spaces</short-title>
+        </portlet-info>
+    </portlet>
 
     <portlet>
         <description>My Web Forms</description>
diff --git a/source/web/jsp/dashboards/dashlets/myspaces-webscript.jsp b/source/web/jsp/dashboards/dashlets/myspaces-webscript.jsp
new file mode 100644
index 0000000000..c2773a4793
--- /dev/null
+++ b/source/web/jsp/dashboards/dashlets/myspaces-webscript.jsp
@@ -0,0 +1,27 @@
+<%--
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+--%>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<r:webScript scriptUrl="/alfresco/service/myspaces" />
\ No newline at end of file