Bugfix and improvements for unmarking potentially archived contacts

src/Protocol/DFRN.php

@@ -1353,11 +1353,6 @@ class DFRN
 			return 3;
 		}
 
-		if ($contact['term-date'] > NULL_DATE) {
-			logger("dfrn_deliver: $url back from the dead - removing mark for death");
-			Contact::unmarkForArchival($contact);
-		}
-
 		$res = XML::parseString($xml);
 
 		if (!isset($res->status)) {
@@ -1368,6 +1363,10 @@ class DFRN
 			logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
 		}
 
+		if ($res->status == 200) {
+			Contact::unmarkForArchival($contact);
+		}
+
 		return intval($res->status);
 	}