diff --git a/include/import-dfrn.php b/include/import-dfrn.php
index edbbde98a0..72d507bbf1 100644
--- a/include/import-dfrn.php
+++ b/include/import-dfrn.php
@@ -961,8 +961,10 @@ class dfrn2 {
 				$item["owner-avatar"] = $importer["thumb"];
 			}
 
-			if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item)))
+			if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+				logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
 				return;
+			}
 
 			// This is my contact on another system, but it's really me.
 			// Turn this into a wall post.
@@ -1183,9 +1185,24 @@ class dfrn2 {
 		foreach ($deletions AS $deletion)
 			self::process_deletion($header, $xpath, $deletion, $importer);
 
-		$entries = $xpath->query("/atom:feed/atom:entry");
-		foreach ($entries AS $entry)
-			self::process_entry($header, $xpath, $entry, $importer);
+		if (!$sort_by_date) {
+			$entries = $xpath->query("/atom:feed/atom:entry");
+			foreach ($entries AS $entry)
+				self::process_entry($header, $xpath, $entry, $importer);
+		} else {
+			$newentries = array();
+			$entries = $xpath->query("/atom:feed/atom:entry");
+			foreach ($entries AS $entry) {
+				$created = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
+				$newentries[strtotime($created)] = $entry;
+			}
+
+			// Now sort after the publishing date
+			ksort($newentries);
+
+			foreach ($newentries AS $entry)
+				self::process_entry($header, $xpath, $entry, $importer);
+		}
 	}
 }
 ?>
diff --git a/include/items.php b/include/items.php
index 0ec645cc7a..52a1071f2d 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1695,11 +1695,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 		}
 		return;
 	}
-	// dfrn-test
-/*
+
 	if ($contact['network'] === NETWORK_DFRN) {
 		logger("Consume DFRN messages", LOGGER_DEBUG);
-		logger("dfrn-test");
 
 		$r = q("SELECT  `contact`.*, `contact`.`uid` AS `importer_uid`,
                                         `contact`.`pubkey` AS `cpubkey`,
@@ -1711,14 +1709,15 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                         FROM `contact`
                         LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                         WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
-	                dbesc($contact["id"], $importer["uid"]);
+	                dbesc($contact["id"]), dbesc($importer["uid"])
 	        );
 		if ($r) {
+			logger("Now import the DFRN feed");
 			dfrn2::import($xml,$r[0], true);
 			return;
 		}
 	}
-*/
+
 	// Test - remove before flight
 	//if ($pass < 2) {
 	//	$tempfile = tempnam(get_temppath(), "dfrn-consume-");