From 4a8ed7268ef8d8ddaf6d8c97fbb395110f061c85 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 26 Jul 2022 10:11:09 +0200
Subject: [PATCH 1/2] Email address autocomplete `value` is sufficient

---
 dev/Component/EmailAddresses.js | 2 +-
 dev/View/Popup/Compose.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/Component/EmailAddresses.js b/dev/Component/EmailAddresses.js
index 3094d0be3..316d06936 100644
--- a/dev/Component/EmailAddresses.js
+++ b/dev/Component/EmailAddresses.js
@@ -113,7 +113,7 @@ export class EmailAddressesComponent {
 				if (datalist.inputValue !== value) {
 					datalist.inputValue = value;
 					value.length && self.options.autoCompleteSource(
-						{term:value},
+						value,
 						items => {
 							self._resetDatalist();
 							items && items.forEach(item => datalist.append(new Option(item)));
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index cbab21815..75e252571 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -754,7 +754,7 @@ export class ComposePopupView extends AbstractViewPopup {
 	}
 
 	// getAutocomplete
-	emailsSource(oData, fResponse) {
+	emailsSource(value, fResponse) {
 		Remote.request('Suggestions',
 			(iError, data) => {
 				if (!iError && isArray(data.Result)) {
@@ -767,7 +767,7 @@ export class ComposePopupView extends AbstractViewPopup {
 				}
 			},
 			{
-				Query: oData.term
+				Query: value
 //				,Page: 1
 			},
 			null,

From 7561ff4c9fe603d1a743185d1dcf06bbd975acbb Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 26 Jul 2022 10:11:22 +0200
Subject: [PATCH 2/2] IncConnectAndLoginHelper => ImapConnectAndLoginHelper

---
 plugins/imap-contacts-suggestions/ImapContactsSuggestions.php | 2 +-
 plugins/kolab/KolabAddressBook.php                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/imap-contacts-suggestions/ImapContactsSuggestions.php b/plugins/imap-contacts-suggestions/ImapContactsSuggestions.php
index a39202ace..db4ebc0db 100644
--- a/plugins/imap-contacts-suggestions/ImapContactsSuggestions.php
+++ b/plugins/imap-contacts-suggestions/ImapContactsSuggestions.php
@@ -16,7 +16,7 @@ class ImapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 		$oMailClient = $oActions->MailClient();
 		if (!$oMailClient->IsLoggined()) {
 			$oAccount = $oActions->getAccountFromToken();
-			$oAccount->IncConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
+			$oAccount->ImapConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
 		}
 		$oImapClient = $oMailClient->ImapClient();
 
diff --git a/plugins/kolab/KolabAddressBook.php b/plugins/kolab/KolabAddressBook.php
index e97ef4835..3df877389 100644
--- a/plugins/kolab/KolabAddressBook.php
+++ b/plugins/kolab/KolabAddressBook.php
@@ -28,7 +28,7 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
 		$oActions = \RainLoop\Api::Actions();
 		$oMailClient = $oActions->MailClient();
 		if (!$oMailClient->IsLoggined()) {
-			$oActions->getAccountFromToken()->IncConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
+			$oActions->getAccountFromToken()->ImapConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
 		}
 		return $oMailClient;
 	}