diff --git a/include/queue.php b/include/queue.php
new file mode 100644
index 000000000..b7fb478b4
--- /dev/null
+++ b/include/queue.php
@@ -0,0 +1,113 @@
+<?php
+
+
+function update_queue_item($id) {
+	logger('queue: requeue item ' . $id);
+	q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
+		dbesc(datetime_convert()),
+		intval($id)
+	);
+}
+
+function remove_queue_item($id) {
+	logger('queue: remove queue item ' . $id);
+	q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
+		intval($id)
+	);
+}
+
+	require_once("boot.php");
+
+	$a = new App;
+
+	@include(".htconfig.php");
+	require_once("dba.php");
+	$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+
+
+	require_once("session.php");
+	require_once("datetime.php");
+	require_once('include/items.php');
+	require_once('include/bbcode.php');
+
+	$a->set_baseurl(get_config('system','url'));
+
+
+	$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
+		LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+		WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
+	if(count($r)) {
+		foreach($r as $rr) {
+			logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
+			logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
+		}
+		q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
+	}
+		
+	$r = q("SELECT `id` FROM `queue` WHERE 1 ");
+
+	if(! count($r))
+		killme();
+
+	// delivery loop
+
+	require_once('include/salmon.php');
+
+	foreach($r as $q_item) {
+		$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
+			intval($q_item['id'])
+		);
+		if(! count($qi))
+			continue;
+
+		$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+			intval($q_item['cid'])
+		);
+		if(! count($c)) {
+			remove_queue_item($q_item['id']);
+			continue;
+		}
+		$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+			intval($c[0]['uid'])
+		);
+		if(! count($u)) {
+			remove_queue_item($q_item['id']);
+			continue;
+		}
+
+		$data      = $qi[0]['content'];
+		$contact   = $c[0];
+		$owner     = $u[0];
+
+		$deliver_status = 0;
+
+		switch($contact['network']) {
+			case 'dfrn':
+				logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
+				$deliver_status = dfrn_deliver($owner,$contact,$data);
+
+				if($deliver_status == (-1))
+					update_queue_time($q_item['id']);
+				else
+					remove_queue_item($q_item['id']);
+
+				break;
+			default:
+				if($contact['notify']) {
+					logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
+					$deliver_status = slapper($owner,$contact['notify'],$data);
+
+					if($deliver_status == (-1))
+						update_queue_time($q_item['id']);
+					else
+						remove_queue_item($q_item['id']);
+				}
+				break;
+		}
+	}
+		
+	killme();
+
+	// NOTREACHED
+