diff --git a/phpgwapi/inc/class.crypto.inc.php b/phpgwapi/inc/class.crypto.inc.php
index 68a629f057..f8b2711623 100644
--- a/phpgwapi/inc/class.crypto.inc.php
+++ b/phpgwapi/inc/class.crypto.inc.php
@@ -115,7 +115,14 @@
 			{
 				if ($this->mcrypt_version != 'old')
 				{
-					mcrypt_generic_end ($this->td);
+					if(phpversion >= '4.1.1')
+					{
+						mcrypt_generic_deinit($this->td);
+					}
+					else
+					{
+						mcrypt_generic_end($this->td);
+					}
 				}
 			}
 		}