diff --git a/src/MailKitMailModule.cs b/src/MailKitMailModule.cs
index 798ddd2..aecf41c 100644
--- a/src/MailKitMailModule.cs
+++ b/src/MailKitMailModule.cs
@@ -282,9 +282,16 @@ namespace OpenSim.Modules.EMail
                         Email lslMessage = new Email();
 
                         lslMessage.time = DateTime.Now.ToShortTimeString();
-                        lslMessage.message = messages[0].Mail.TextBody.ToString();
-                        lslMessage.sender = messages[0].Mail.Sender.GetAddress(true);
-                        lslMessage.subject = messages[0].Mail.Subject;
+
+                        if (messages[0].Mail.TextBody != null)
+                            lslMessage.message = messages[0].Mail.TextBody.ToString();
+
+                        if(messages[0].Mail.Sender != null)
+                            lslMessage.sender = messages[0].Mail.Sender.GetAddress(true);
+
+                        if (messages[0].Mail.Subject != null)
+                            lslMessage.subject = messages[0].Mail.Subject;
+
                         lslMessage.numLeft = messages.Count - 1;
 
                         m_messages.Remove(messages[0]);