diff --git a/src/MailKitMailModule.cs b/src/MailKitMailModule.cs
index fdbca42..e4c1e9f 100644
--- a/src/MailKitMailModule.cs
+++ b/src/MailKitMailModule.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Modules.EMail
         private bool IMAP_SERVER_SSL = false;
         private bool IMAP_SERVER_TLS = false;
 
+        private bool m_requester = false;
 
         #region ISharedRegionModule
         public string Name
@@ -137,6 +138,9 @@ namespace OpenSim.Modules.EMail
 
         private void checkForMails(object sender, ElapsedEventArgs f)
         {
+            if (!m_requester)
+                return;
+
             try
             {
                 if(m_debug)
@@ -276,6 +280,8 @@ namespace OpenSim.Modules.EMail
 
         public Email GetNextEmail(UUID objectID, string sender, string subject)
         {
+            m_requester = true;
+
             SceneObjectPart sceneObject = m_scene.GetSceneObjectPart(objectID);
 
             if(sceneObject != null)