diff --git a/config/alfresco/bootstrap/notification/wf-email.html.ftl b/config/alfresco/bootstrap/notification/wf-email.html.ftl
index f5ede4a675..5e6f0c9f88 100644
--- a/config/alfresco/bootstrap/notification/wf-email.html.ftl
+++ b/config/alfresco/bootstrap/notification/wf-email.html.ftl
@@ -1,6 +1,4 @@
 <html>
-
-
    <head>
       <style type="text/css"><!--
       body
@@ -51,58 +49,76 @@
                                           </table>
                                           <div style="font-size: 14px; margin: 12px 0px 24px 0px; padding-top: 10px; border-top: 1px solid #aaaaaa;">
                                              <p>Hi,</p>
-      
+
                                              <p>
-                                                 <#if args.workflowPooled == true>
-                                             		The following pooled task is available to be claimed:
-                                             	 <#else>
-                                             	    You have been assigned the following task:
-                                             	 </#if>
+                                                <#if args.workflowPooled == true>
+                                                   The following pooled task is available to be claimed:
+                                                <#else>
+                                                   You have been assigned the following task:
+                                                </#if>
                                              </p>
                                              
-                                             <p><b>"${args.workflowDescription}"</b></p>
+                                             <p><b>"${args.workflowTitle}"</b></p>
                                              
                                              <p>
                                                 <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
                                                 <#if (args.workflowPriority)??>
-                                                	Priority:&nbsp;&nbsp;
-                                                	<b>
-                                                	<#if args.workflowPriority == 3>
-                                                		Low
-                                                	<#elseif args.workflowPriority == 2>
-                                                		Medium
-                                                	<#else>
-                                                		High
-                                                	</#if>
-                                                	</b>
+                                                   Priority:&nbsp;&nbsp;
+                                                   <b>
+                                                   <#if args.workflowPriority == 3>
+                                                      Low
+                                                   <#elseif args.workflowPriority == 2>
+                                                      Medium
+                                                   <#else>
+                                                      High
+                                                   </#if>
+                                                   </b>
                                                 </#if>
                                              </p>
                                              
-                                             <#if (args.workflowDocuments)??>                                             
-                                             	<table cellpadding=0 callspacing=0 border=0>                                             	
-	                                             	<#list args.workflowDocuments as doc>
-	                                             		<tr><td><table cellpadding=0 cellspacing=0 border=0><tr>
-                                         		    		<td><img src="${shareUrl}/res/components/images/generic-file.png" alt="" width="64" height="64" border="0" style="padding-right: 20px;" /></td>
-                                         					<td><table cellpadding=0 cellspacing=0 border=0>
-                                         						<tr><td><b>${doc.name}</b></td></tr>
-                                         						<tr><td>Click on this link to download the document:</td></tr>
-                                         						<tr><td>
-                                         							<a href="${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true">
-                                         								${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true
-                                         							</a>
-                                         						</td></tr>
-                                         					</table></td>
-	                                             		</tr></table></td></tr>
-	                                             	</#list>                                             		
-                                             	</table>                                             
+                                             <#if (args.workflowDocuments)??>
+                                                <table cellpadding="0" callspacing="0" border="0" bgcolor="#eeeeee" style="padding:10px; border: 1px solid #aaaaaa;">
+                                                   <#list args.workflowDocuments as doc>
+                                                      <tr>
+                                                         <td>
+                                                            <table cellpadding="0" cellspacing="0" border="0">
+                                                               <tr>
+                                                                  <td valign="top">
+                                                                     <img src="${shareUrl}/res/components/images/generic-file.png" alt="" width="64" height="64" border="0" style="padding-right: 10px;" />
+                                                                  </td>
+                                                                  <td>
+                                                                     <table cellpadding="2" cellspacing="0" border="0">
+                                                                        <tr>
+                                                                           <td><b>${doc.name}</b></td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td>Click on this link to download the document:</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td>
+                                                                              <a href="${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true">
+                                                                              ${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true</a>
+                                                                           </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                            </table>
+                                                         </td>
+                                                      </tr>
+                                                      <#if doc_has_next>
+                                                         <tr><td><div style="border-top: 1px solid #aaaaaa; margin:12px;"></div></td></tr>
+                                                      </#if>
+                                                   </#list>
+                                                </table>
                                              </#if>
                                              
                                              <#if args.workflowPooled == true>
                                                 <p>Click this link to view the task:</p>
-                                             	<p><a href="${shareUrl}/page/task-view?taskId=${args.workflowId}">${shareUrl}/page/task-view?taskId=${args.workflowId}</a>
+                                                <p><a href="${shareUrl}/page/task-details?taskId=${args.workflowId}">${shareUrl}/page/task-details?taskId=${args.workflowId}</a>
                                              <#else>
-                                             	<p>Click this link to edit the task:</p>
-                                             	<p><a href="${shareUrl}/page/task-details?taskId=${args.workflowId}">${shareUrl}/page/task-edit?taskId=${args.workflowId}</a>
+                                                <p>Click this link to edit the task:</p>
+                                                <p><a href="${shareUrl}/page/task-edit?taskId=${args.workflowId}">${shareUrl}/page/task-edit?taskId=${args.workflowId}</a>
                                              </#if>
                                              
                                              <p>Sincerely,<br />
diff --git a/config/alfresco/bootstrap/notification/workflow-email-notification.xml b/config/alfresco/bootstrap/notification/workflow-email-notification.xml
index daf3c03e56..33926fb051 100644
--- a/config/alfresco/bootstrap/notification/workflow-email-notification.xml
+++ b/config/alfresco/bootstrap/notification/workflow-email-notification.xml
@@ -15,25 +15,25 @@
         </view:properties>
         <view:associations>
             <cm:contains>
-        		<cm:content view:childName="cm:invite-email.html.ftl">
-				    <view:aspects>
-				      <cm:auditable></cm:auditable>
-				      <sys:referenceable></sys:referenceable>
-				      <app:inlineeditable></app:inlineeditable>
-				    </view:aspects>
-				    <view:acl></view:acl>
-				    <view:properties>
-				      <app:editInline>true</app:editInline>	  
-				      <sys:store-protocol>workspace</sys:store-protocol>
-				      <sys:store-identifier>SpacesStore</sys:store-identifier>
-				      <sys:node-uuid>wf-email-html-ftl</sys:node-uuid>
-				      <cm:name>wf-email.html.ftl</cm:name>
-				      <cm:title>wf-email.html.ftl</cm:title>
-				      <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
-				      <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html.ftl|mimetype=text/plain|size=1455|encoding=UTF-8</cm:content>
-				    </view:properties>
-  				</cm:content>
-  			</cm:contains>
-  		</view:associations>
+                <cm:content view:childName="cm:invite-email.html.ftl">
+                    <view:aspects>
+                        <cm:auditable></cm:auditable>
+                        <sys:referenceable></sys:referenceable>
+                        <app:inlineeditable></app:inlineeditable>
+                    </view:aspects>
+                    <view:acl></view:acl>
+                    <view:properties>
+                        <app:editInline>true</app:editInline>	  
+                        <sys:store-protocol>workspace</sys:store-protocol>
+                        <sys:store-identifier>SpacesStore</sys:store-identifier>
+                        <sys:node-uuid>wf-email-html-ftl</sys:node-uuid>
+                        <cm:name>wf-email.html.ftl</cm:name>
+                        <cm:title>wf-email.html.ftl</cm:title>
+                        <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
+                        <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html.ftl|mimetype=text/plain|size=1455|encoding=UTF-8</cm:content>
+                    </view:properties>
+                </cm:content>
+            </cm:contains>
+        </view:associations>
     </cm:folder>
 </view:view>
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
index 867ab91874..ff64182cd6 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
@@ -1,5 +1,20 @@
-/**
- * 
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 package org.alfresco.repo.workflow;
 
@@ -22,8 +37,6 @@ import org.springframework.extensions.surf.util.I18NUtil;
 /**
  * Utility class containing methods to help when sending workflow notifications.
  * 
- * TODO? Move to workflow serivce??
- * 
  * @author Roy Wetherall
  */
 public abstract class WorkflowNotificationUtils
@@ -88,7 +101,7 @@ public abstract class WorkflowNotificationUtils
         notificationContext.setBodyTemplate(WF_ASSIGNED_TEMPLATE);    
         
         // Build the template args
-        Map<String, Serializable>templateArgs = new HashMap<String, Serializable>(7);        
+        Map<String, Serializable>templateArgs = new HashMap<String, Serializable>(7);
         templateArgs.put(ARG_WF_ID, taskId);
         templateArgs.put(ARG_WF_TITLE, title);
         templateArgs.put(ARG_WF_DESCRIPTION, description);
@@ -122,7 +135,7 @@ public abstract class WorkflowNotificationUtils
         }
         
         // Set the template args
-        notificationContext.setTemplateArgs(templateArgs);            
+        notificationContext.setTemplateArgs(templateArgs);
         
         // Set the notification recipients
        for (String assignedAuthority : assignedAuthorites)
@@ -131,7 +144,7 @@ public abstract class WorkflowNotificationUtils
        }
         
         // Send email notification
-        services.getNotificationService().sendNotification(EMailNotificationProvider.NAME, notificationContext);        
+        services.getNotificationService().sendNotification(EMailNotificationProvider.NAME, notificationContext);
     }
     
     /**
@@ -151,10 +164,10 @@ public abstract class WorkflowNotificationUtils
         WorkflowTask workflowTask = services.getWorkflowService().getTaskById(taskId);
         
         // Get the workflow properties
-        Map<QName, Serializable> props = workflowTask.getProperties();        
+        Map<QName, Serializable> props = workflowTask.getProperties();
         
         // Get the title and description
-        String title = workflowTask.getTitle();        
+        String title = workflowTask.getTitle();
         String description = (String)props.get(WorkflowModel.PROP_DESCRIPTION);
         if (description == null)
         {
@@ -162,8 +175,8 @@ public abstract class WorkflowNotificationUtils
         }
         
         // Get the duedate, priority and workflow package
-        Date dueDate = (Date)props.get(WorkflowModel.PROP_DUE_DATE);        
-        Integer priority = (Integer)props.get(WorkflowModel.PROP_PRIORITY);       
+        Date dueDate = (Date)props.get(WorkflowModel.PROP_DUE_DATE);
+        Integer priority = (Integer)props.get(WorkflowModel.PROP_PRIORITY);
         NodeRef workflowPackage = workflowTask.getPath().getInstance().getWorkflowPackage();
 
         // Send notification
