diff --git a/.gitattributes b/.gitattributes
index 17d5c942..be9c3816 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,3 +18,9 @@
 *.yarnclean text eol=lf
 *.lock text eol=lf
 *.yarn-integrity text eol=lf
+
+.github/ export-ignore
+tests/ export-ignore
+.travis.yml export-ignore
+.scrutinizer.yml export-ignore
+.sensiolabs.yml export-ignore
diff --git a/plugins/yetiforce/yetiforce.php b/plugins/yetiforce/yetiforce.php
index 367f4bb4..7c34c377 100644
--- a/plugins/yetiforce/yetiforce.php
+++ b/plugins/yetiforce/yetiforce.php
@@ -262,8 +262,8 @@ public function messageComposeHead($args)
 				chdir($this->rc->config->get('root_directory'));
 				$this->loadCurrentUser();
 
-				$subjectNumber = \App\Fields\Email::findRecordNumber($subject, $params['crmmodule']);
-				$recordNumber = \App\Fields\Email::findRecordNumber("[{$params['recordNumber']}]", $params['crmmodule']);
+				$subjectNumber = \App\Mail\RecordFinder::getRecordNumberFromString($subject, $params['crmmodule']);
+				$recordNumber = \App\Mail\RecordFinder::getRecordNumberFromString("[{$params['recordNumber']}]", $params['crmmodule']);
 				if (false === $subject || (false !== $subject && $subjectNumber !== $recordNumber)) {
 					$subject = "[{$params['recordNumber']}] $subject";
 				}
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 04e30dbb..2b07890c 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -16,11 +16,7 @@ if (strlen($search)) {
         $addressBookFile = $RCMAIL->config->get('root_directory') . 'cache/addressBook/mails_' . $crmUserId . '.php';
         if (is_file($addressBookFile)) {
             include $addressBookFile;
-            foreach ($bookMails as $row) {
-                if (stripos($row, $search) !== false) {
-                    $contacts[] = $row;
-                }
-            }
+						$contacts = preg_grep("/{$search}/i", $bookMails);
         }
     }
 }
diff --git a/version.php b/version.php
index 783c4049..f4fdbf77 100644
--- a/version.php
+++ b/version.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-	'patch' => '2019.10.04',
-	'version' => '0.0.81'
+	'patch' => '2019.11.07',
+	'version' => '0.0.84'
 ];