From b48bb466c62ab125f74e564b48ea6e95406c41cb Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 14 Dec 2011 17:30:57 +0000
Subject: [PATCH] ALF-12033

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/imap/ContentModelMessage.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/java/org/alfresco/repo/imap/ContentModelMessage.java b/source/java/org/alfresco/repo/imap/ContentModelMessage.java
index 1247670a0c..968aae4e4c 100644
--- a/source/java/org/alfresco/repo/imap/ContentModelMessage.java
+++ b/source/java/org/alfresco/repo/imap/ContentModelMessage.java
@@ -264,10 +264,13 @@ public class ContentModelMessage extends AbstractMimeMessage
             try
             {
 
-              StringBuilder contentAuthor = new StringBuilder();
-              contentAuthor.append("\"").append(author).append("\" <").append(defaultFromAddress).append(">");
-              result = InternetAddress.parse(contentAuthor.toString());
-              return result;
+                if(!(author == null || author.isEmpty()))
+                {        
+                    StringBuilder contentAuthor = new StringBuilder();
+                    contentAuthor.append("\"").append(author).append("\" <").append(defaultFromAddress).append(">");
+                    result = InternetAddress.parse(contentAuthor.toString());
+                    return result;
+                }
             
             }
             catch (AddressException e)