diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 43526a372..f3784d3ff 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -389,7 +389,7 @@ class OnePoll
 							// Have we seen it before?
 							$fields = ['deleted', 'id'];
 							$condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
-							$item = dba::selectFirst('item', $fields, $condition);
+							$item = Item::selectFirst($fields, $condition);
 							if (DBM::is_result($item)) {
 								logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
 
@@ -435,13 +435,17 @@ class OnePoll
 								$refs_arr = explode(' ', $raw_refs);
 								if (count($refs_arr)) {
 									for ($x = 0; $x < count($refs_arr); $x ++) {
-										$refs_arr[$x] = "'" . Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''],dbesc($refs_arr[$x]))) . "'";
+//										$refs_arr[$x] = "'" . Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''],dbesc($refs_arr[$x]))) . "'";
+										$refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
 									}
 								}
 								$condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
 								$parent = Item::selectFirst(['parent-uri'], $condition);
 								if (DBM::is_result($parent)) {
+									logger('Parent found with matching uri. ' . json_encode($refs_arr), LOGGER_DEBUG);
 									$datarray['parent-uri'] = $parent['parent-uri'];  // Set the parent as the top-level item
+								} else {
+									logger('No parent found with matching uri. ' . json_encode($refs_arr), LOGGER_DEBUG);
 								}
 							}
 
@@ -474,7 +478,10 @@ class OnePoll
 								$params = ['order' => ['created' => true]];
 								$parent = Item::selectFirst(['parent-uri'], $condition, $params);
 								if (DBM::is_result($parent)) {
+									logger('Parent found with matching title. ' . $datarray['title'], LOGGER_DEBUG);
 									$datarray['parent-uri'] = $parent['parent-uri'];
+								} else {
+									logger('No parent found with matching title. ' . $datarray['title'], LOGGER_DEBUG);
 								}
 							}