diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 97f7ac531..ab1ce38fa 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -328,6 +328,7 @@ class Apps {
 			'Content Import' => t('Content Import'),
 			'Connections' => t('Connections'),
 			'Expire Posts' => t('Expire Posts'),
+			'Future Posting' => t('Future Posting'),
 			'Remote Diagnostics' => t('Remote Diagnostics'),
 			'Suggest Channels' => t('Suggest Channels'),
 			'Login' => t('Login'),
diff --git a/Zotlabs/Module/Future.php b/Zotlabs/Module/Future.php
new file mode 100644
index 000000000..215e5434d
--- /dev/null
+++ b/Zotlabs/Module/Future.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Zotlabs\Module;
+
+use Zotlabs\Lib\Apps;
+use Zotlabs\Lib\Libsync;
+use Zotlabs\Web\Controller;
+
+class Future extends Controller {
+
+	function get() {
+
+        $desc = t('This app allows you to set an optional publish date/time for posts, which may be in the future. This must be at least ten minutes into the future to initiate delayed publishing. The posts will be published automatically after that time has passed. Once installed, a new button will appear in the post editor to set the date/time.');
+
+        $text = '<div class="section-content-info-wrapper">' . $desc . '</div>';
+
+		return $text;
+
+	}
+
+}
diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index 123b53b98..98d6ae292 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -511,10 +511,9 @@ class Linkinfo extends Controller {
 	
 
 	private static function arr_add_hashes(&$item,$k) {
-		$item = '#' . $item;
+		if (substr($item,0,1) !== '#') {
+			$item = '#' . $item;
+		}
 	}
 
-
-
-
 }
diff --git a/app/future.apd b/app/future.apd
new file mode 100644
index 000000000..18c41791a
--- /dev/null
+++ b/app/future.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/future
+requires: local_channel
+name: Future Posting
+photo: icon:clock-o
+categories: Networking
diff --git a/include/conversation.php b/include/conversation.php
index c6dd75087..88d75246c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1260,7 +1260,7 @@ function z_status_editor($a, $x, $popup = false) {
 	if(x($x, 'hide_expire'))
 		$feature_expire = false;
 
-	$feature_future = ((feature_enabled($x['profile_uid'], 'delayed_posting') && (! $webpage)) ? true : false);
+	$feature_future = ((Apps::system_app_installed($x['profile_uid'], 'Future Posting') && (! $webpage)) ? true : false);
 	if(x($x, 'hide_future'))
 		$feature_future = false;