diff --git a/picomon/checks.py b/picomon/checks.py
index d274c8b21760f90e2c3d20cc881632f51cdab1e7..b007d60303b0351d8845a1ae0497a1dfe3a09c5c 100644
--- a/picomon/checks.py
+++ b/picomon/checks.py
@@ -67,8 +67,8 @@ class Check(object):
             self.setup()
             if not self.check():
                 logging.debug('Fail: ' + str(self))
-                self.retry_count = min(self.retry_count + 1, self.retry)
-                if self.retry_count == self.retry or immediate:
+                self.retry_count += 1
+                if self.retry_count >= self.retry or immediate:
                     if self.ok:
                         logging.debug('Switched to failure: ' + str(self))
                         self.failure_date = datetime.now()
diff --git a/picomon/mails.py b/picomon/mails.py
index 15ee00f104e25ebffa6833f67e5852faec426b81..d006045b790463ae47bd5f5e9ccdb2629f8e9300 100644
--- a/picomon/mails.py
+++ b/picomon/mails.py
@@ -105,7 +105,7 @@ def send_email_for_check(check):
         delta = datetime.now() - check.failure_date
         # remove microsec
         delta = delta - timedelta(microseconds=delta.microseconds)
-        n = delta // timedelta(seconds=check.error_every * config.base_tick)
+        n = check.retry_count + 1 - check.retry
         msg_text += ("recovered after %s (%d %s)." %
                      (delta, n, "retry" if n == 1 else "retries"))
     else: