diff --git a/src/MailKitMailModule.cs b/src/MailKitMailModule.cs
index e4c1e9f..9713f56 100644
--- a/src/MailKitMailModule.cs
+++ b/src/MailKitMailModule.cs
@@ -256,7 +256,8 @@ namespace OpenSim.Modules.EMail
             using (var client = new SmtpClient())
             {
                 client.CheckCertificateRevocation = false;
-                
+                client.Timeout = 10;
+
                 if (SMTP_SERVER_SSL == true)
                 {
                     client.Connect(SMTP_SERVER_HOSTNAME, SMTP_SERVER_PORT, SecureSocketOptions.Auto);
@@ -309,8 +310,11 @@ namespace OpenSim.Modules.EMail
 
                         lslMessage.numLeft = messages.Count - 1;
 
-                        m_messages.Remove(messages[0]);
-                        return lslMessage;
+                        if((lslMessage.sender == sender || sender == "") && (lslMessage.subject == subject || subject == ""))
+                        {
+                            m_messages.Remove(messages[0]);
+                            return lslMessage;
+                        }
                     }
                     else
                     {