diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
index e6770938bf..beadc381ac 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
@@ -26,7 +26,7 @@
    <ul>
       <li id="current"><a title="My Alfresco" href="${url.serviceContext}/office/myAlfresco?p=${path?url}&amp;e=${extn}&amp;n=${nav}"><span><img src="${url.context}/images/office/my_alfresco.gif" alt="My Alfresco" /></span></a></li>
       <li><a title="Browse Spaces and Documents" href="${url.serviceContext}/office/navigation?p=${path?url}&amp;e=${extn}&amp;n=${nav}"><span><img src="${url.context}/images/office/navigator.gif" alt="Browse Spaces and Documents" /></span></a></li>
-      <li><a title="Search Alfresco" href="${url.serviceContext}/office/search?p=${path?url}&amp;e=${extn}&amp;n=${nav}"><span><img src="${url.context}/images/office/search.gif" alt="Search Alfresco" /></span></a></li>
+      <li><a title="Search Alfresco" href="${url.serviceContext}/office/search?p=${path?url}&amp;e=${extn}&amp;n=${nav}&amp;ticket=${session.ticket}"><span><img src="${url.context}/images/office/search.gif" alt="Search Alfresco" /></span></a></li>
       <li><a title="View Details" href="${url.serviceContext}/office/documentDetails?p=${path?url}&amp;e=${extn}&amp;n=${nav}"><span><img src="${url.context}/images/office/document_details.gif" alt="View Details" /></span></a></li>
       <li><a title="My Tasks" href="${url.serviceContext}/office/myTasks?p=${path?url}&amp;e=${extn}&amp;n=${nav}"><span><img src="${url.context}/images/office/my_tasks.gif" alt="My Tasks" /></span></a></li>
    </ul>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
index afb8a23eb1..f40826b18b 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
@@ -120,9 +120,8 @@
             <div class="taskValue"><textarea id="wrkDescription" rows="4" style="height:54px;"></textarea></div>
             <div class="taskParam">&nbsp;</div>
             <div class="taskValue">
-               <a class="taskAction" href="#" onclick="OfficeMyTasks.startWorkflow('${url.serviceContext}/office/docActions', '${d.id}');">
-                  Submit
-               </a>
+               <a class="taskAction" href="#" onclick="OfficeMyTasks.startWorkflow('${url.serviceContext}/office/docActions', '${d.id}');">Submit</a>
+               <a class="taskAction" href="${url.serviceContext}/office/myTasks?p=${path?url}&amp;e=${extn}&amp;n=${nav}">Cancel</a>
             </div>
 
          </div>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
index 92317254ee..7eeddbd1a5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
@@ -1,3 +1,4 @@
+<#assign doc_actions="${url.serviceContext}/office/docActions">
 <#if args.e?exists><#assign extn=args.e><#else><#assign extn="doc"></#if><#assign extnx=extn+"x">
 <#if args.t?exists>
    <#assign taskid = args.t>
@@ -45,18 +46,30 @@
    <#list task.packageResources as res>
          <tr>
       <#if res.isDocument>
+         <#assign relativePath = (res.displayPath?substring(companyhome.name?length+1) + '/' + res.name)?url?replace('%2F', '/')?replace('\'', '\\\'') />
          <#if res.name?ends_with(extn) || res.name?ends_with(extnx)>
-            <#assign relativePath = (res.displayPath?substring(companyhome.name?length+1) + '/' + res.name)?url?replace('%2F', '/')?replace('\'', '\\\'') />
-            <td width="16"><a href="${url.context}${res.url}" target="new"><img src="${url.context}${res.icon16}" alt="${res.name}"></a></td>
+            <td width="16" valign="top"><a href="${url.context}${res.url}" target="new"><img src="${url.context}${res.icon16}" alt="${res.name}"></a></td>
             <td>
                <a href="#" onclick="window.external.openDocument('${relativePath}')" title="Open ${res.name}">${res.name}</a>
-            </td>
          <#else>
-            <td width="16"><a href="${url.context}${res.url}?ticket=${session.ticket}" target="_blank" title="Open ${res.name}"><img src="${url.context}${res.icon16}" alt="${res.name}"></a></td>
+            <td width="16" valign="top"><a href="${url.context}${res.url}?ticket=${session.ticket}" target="_blank" title="Open ${res.name}"><img src="${url.context}${res.icon16}" alt="${res.name}"></a></td>
             <td>
                <a href="${url.context}${res.url}?ticket=${session.ticket}" target="_blank">${res.name}</a>
-            </td>
          </#if>
+            <br />
+               Modified: ${res.properties.modified?datetime} (${(res.size / 1024)?int}Kb)<br />
+         <#if res.isLocked >
+               <img src="${url.context}/images/office/lock.gif" style="padding:3px 6px 2px 0px;" alt="Locked" />
+         <#elseif hasAspect(res, "cm:workingcopy") == 1>
+               <a href="#" onclick="OfficeMyTasks.runAction('${doc_actions}','checkin','${res.id}', '');"><img src="${url.context}/images/office/checkin.gif" style="padding:3px 6px 2px 0px;" alt="Check In" title="Check In" /></a>
+         <#else>
+               <a href="#" onclick="OfficeMyTasks.runAction('${doc_actions}','checkout','${res.id}', '');"><img src="${url.context}/images/office/checkout.gif" style="padding:3px 6px 2px 0px;" alt="Check Out" title="Check Out" /></a>
+         </#if>
+               <a href="#" onclick="window.external.insertDocument('${relativePath}')"><img src="${url.context}/images/office/insert_document.gif" style="padding:3px 6px 2px 0px;" alt="Insert File into Current Document" title="Insert File into Current Document" /></a>
+         <#if !res.name?ends_with(".pdf")>
+               <a href="#" onclick="OfficeMyTasks.runAction('${doc_actions}','makepdf','${res.id}', '');"><img src="${url.context}/images/office/makepdf.gif" style="padding:3px 6px 2px 0px;" alt="Make PDF..." title="Make PDF" /></a>
+         </#if>
+            </td>
       <#else>
             <td width="16"><img src="${url.context}${res.icon16}" alt="${res.name}"></td>
             <td>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl
index acd3b73068..aa6ed8e857 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl
@@ -2,7 +2,7 @@
 <#if args.n?exists><#assign node=args.n><#else><#assign node=companyhome></#if>
 <#if args.e?exists><#assign extn=args.e><#else><#assign extn="doc"></#if><#assign extnx=extn+"x">
 <#if args.n?exists><#assign nav=args.n><#else><#assign nav=""></#if>
-<#assign searchCommand="OfficeSearch.runSearch('${url.serviceContext}/office/searchResults', '${path}&amp;e=${extn}')" >
+<#assign searchCommand="OfficeSearch.runSearch('${url.serviceContext}/office/searchResults', '${path?url}&amp;e=${extn}')" >
 <#if (args.searchagain?exists)><#assign searchText=args.searchagain><#else><#assign searchText=""></#if>
 <#if (args.maxresults?exists)><#assign maxResults=args.maxresults><#else><#assign maxResults="5"></#if>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
index 890bfc9201..3d564382c3 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
@@ -1,3 +1,5 @@
+<#assign doc_actions="${url.serviceContext}/office/docActions">
+<#if args.p?exists><#assign path=args.p><#else><#assign path=""></#if>
 <#if args.e?exists><#assign extn=args.e><#else><#assign extn="doc"></#if><#assign extnx=extn+"x">
 <#if args.search?exists>
    <#assign searchString = args.search>
@@ -28,8 +30,8 @@
       <#list results as child>
          <#assign resCount=resCount + 1>
          <#if child.isDocument>
+            <#assign relativePath = (child.displayPath?substring(companyhome.name?length+1) + '/' + child.name)?url?replace('%2F', '/')?replace('\'', '\\\'') />
             <#if child.name?ends_with(extn) || child.name?ends_with(extnx)>
-               <#assign relativePath = (child.displayPath?substring(companyhome.name?length+1) + '/' + child.name)?url?replace('%2F', '/')?replace('\'', '\\\'') />
                <#assign openURL = "#">
                <#assign hrefExtra = " onClick=\"window.external.openDocument('${relativePath}')\"">
             <#else>
@@ -53,6 +55,21 @@
          </#if>
          <#if child.isDocument>
             Modified: ${child.properties.modified?datetime} (${(child.size / 1024)?int}Kb)<br />
+            <#if child.isLocked >
+            <img src="${url.context}/images/office/lock.gif" style="padding:3px 6px 2px 0px;" alt="Locked" />
+            <#elseif hasAspect(child, "cm:workingcopy") == 1>
+            <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','checkin','${child.id}', '');"><img src="${url.context}/images/office/checkin.gif" style="padding:3px 6px 2px 0px;" alt="Check In" title="Check In" /></a>
+            <#else>
+            <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','checkout','${child.id}', '');"><img src="${url.context}/images/office/checkout.gif" style="padding:3px 6px 2px 0px;" alt="Check Out" title="Check Out" /></a>
+            </#if>
+            <a href="${url.serviceContext}/office/myTasks?p=${path?url}&amp;w=new&amp;wd=${child.id}"><img src="${url.context}/images/office/new_workflow.gif" style="padding:3px 6px 2px 0px;" alt="Create Workflow..." title="Create Workflow..." /></a>
+            <a href="#" onclick="window.external.insertDocument('${relativePath}')"><img src="${url.context}/images/office/insert_document.gif" style="padding:3px 6px 2px 0px;" alt="Insert File into Current Document" title="Insert File into Current Document" /></a>
+            <#if !child.name?ends_with(".pdf")>
+            <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','makepdf','${child.id}', '');"><img src="${url.context}/images/office/makepdf.gif" style="padding:3px 6px 2px 0px;" alt="Make PDF..." title="Make PDF" /></a>
+            </#if>
+            <#if !child.isLocked>
+            <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','delete','${child.id}', 'Are you sure you want to delete this document?');"><img src="${url.context}/images/office/delete.gif" style="padding:3px 6px 2px 0px;" alt="Delete..." title="Delete" /></a>
+            </#if>
          </#if>
       </span>
    </div>
diff --git a/source/web/css/office.css b/source/web/css/office.css
index ab494340fb..88aeda11df 100644
--- a/source/web/css/office.css
+++ b/source/web/css/office.css
@@ -27,6 +27,7 @@ body {
 a {
    color: #0073e6;
    text-decoration: none;
+   outline: none;
 }
 
 a img {
diff --git a/source/web/scripts/office/my_tasks.js b/source/web/scripts/office/my_tasks.js
index 52dc74b916..b11f4159fe 100644
--- a/source/web/scripts/office/my_tasks.js
+++ b/source/web/scripts/office/my_tasks.js
@@ -228,6 +228,21 @@ var OfficeMyTasks =
       myAjax.request();
    },
    
+   /* AJAX call to perform server-side actions */
+   runAction: function(useTemplate, Action, Doc, Msg)
+   {
+      // Re-select a selected task after reload
+      var taskSel = $E('#taskList .taskItemSelected');
+      var extraParams = "";
+      if (taskSel != null)
+      {
+         var taskId = taskSel.id;
+         extraParams = "t=" + encodeURI(taskId);
+      }
+      
+      OfficeAddin.runAction(useTemplate, Action, Doc, Msg, extraParams);
+   },
+
    refreshPage: function()
    {
       // Remove any trailing hash
diff --git a/source/web/scripts/office/office_addin.js b/source/web/scripts/office/office_addin.js
index 0d53d50407..afa5a5d0f3 100644
--- a/source/web/scripts/office/office_addin.js
+++ b/source/web/scripts/office/office_addin.js
@@ -91,7 +91,7 @@ var OfficeAddin =
    },
    
    /* AJAX call to perform server-side actions */
-   runAction: function(useTemplate, Action, Doc, Msg)
+   runAction: function(useTemplate, Action, Doc, Msg, extraParams)
    {
       if (Msg != "" && !confirm(Msg))
       {
@@ -114,6 +114,7 @@ var OfficeAddin =
             {
                href += (href.indexOf("?") == -1) ? "?" : "&";
                href += "st=" + encodeURI(textResponse);
+               href += "&" + extraParams;
             }
             window.location.href = href;
          }