diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 50b40039a..c14a00037 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -67,7 +67,8 @@ class Apps {
 			'View Profile',
 			'Photos',
 			'Calendar',
-			'Directory',
+//			'Directory',
+			'Events',
 			'Search',
 			'Profile Photo'
 		]);
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index d3739715a..b3393d047 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -12,7 +12,7 @@ class Enotify {
 	/**
 	 * @brief
 	 *
-	 * @param array $params an assoziative array with:
+	 * @param array $params an associative array with:
 	 *  * \e string \b from_xchan sender xchan hash
 	 *  * \e string \b to_xchan recipient xchan hash
 	 *  * \e array \b item an assoziative array
@@ -53,6 +53,8 @@ class Enotify {
 			return;
 		}
 
+
+
 		// from here on everything is in the recipients language
 
 		push_lang($recip['account_language']); // should probably have a channel language
@@ -840,6 +842,9 @@ class Enotify {
 
 		$ret = '';
 
+		$expire = get_config('system','default_expire_days');
+		$expire_date = (($expire) ? datetime_convert('UTC','UTC','now() - ' . $expire . ' days') : NULL_DATE);
+
 		require_once('include/conversation.php');
 
 		// Call localize_item to get a one line status for activities. 
@@ -898,6 +903,11 @@ class Enotify {
 			'display' => true
 		);
 
+		$post_date = (($edit)? $item['edited'] : $item['created']);
+		if($post_date && $post_date < $expire_date) {
+			return [];
+		}
+
 		call_hooks('enotify_format',$x);
 		if(! $x['display']) {
 			return [];
diff --git a/Zotlabs/Module/Calendar.php b/Zotlabs/Module/Calendar.php
index 40404e4c7..6d39483bb 100644
--- a/Zotlabs/Module/Calendar.php
+++ b/Zotlabs/Module/Calendar.php
@@ -4,7 +4,7 @@ namespace Zotlabs\Module;
 use App;
 use Zotlabs\Web\Controller;
 use Zotlabs\Lib\Libsync;
-use Zotlabs\Lib\AccessControl;
+use Zotlabs\Access\AccessControl;
 use Zotlabs\Lib\Apps;
 use Zotlabs\Daemon\Master;
 
diff --git a/app/events.apx b/app/events.apd
similarity index 100%
rename from app/events.apx
rename to app/events.apd