diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index c16888c0f..66b907663 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -101,11 +101,6 @@ class Actions
 	 */
 	protected $oLocalSettingsProvider = null;
 
-	/**
-	 * @var \RainLoop\Providers\AddressBook
-	 */
-	protected $oAddressBookProvider = null;
-
 	/**
 	 * @var \RainLoop\Config\Application
 	 */
@@ -468,31 +463,6 @@ class Actions
 		return $this->oDomainProvider;
 	}
 
-	public function AddressBookProvider(?Model\Account $oAccount = null): Providers\AddressBook
-	{
-		if (null === $this->oAddressBookProvider) {
-			$oDriver = null;
-			try {
-//				if ($this->oConfig->Get('contacts', 'enable', false)) {
-				if ($this->GetCapa(Capa::CONTACTS)) {
-					$oDriver = $this->fabrica('address-book', $oAccount);
-				}
-				if ($oAccount && $oDriver) {
-					$oDriver->SetEmail($this->GetMainEmail($oAccount));
-					$oDriver->setDAVClientConfig($this->getContactsSyncData($oAccount));
-				}
-			} catch (\Throwable $e) {
-				\SnappyMail\LOG::error('AddressBook', $e->getMessage()."\n".$e->getTraceAsString());
-				$oDriver = null;
-//				$oDriver = new Providers\AddressBook\PdoAddressBook();
-			}
-			$this->oAddressBookProvider = new Providers\AddressBook($oDriver);
-			$this->oAddressBookProvider->SetLogger($this->oLogger);
-		}
-
-		return $this->oAddressBookProvider;
-	}
-
 	public function Cacher(?Model\Account $oAccount = null, bool $bForceFile = false): \MailSo\Cache\CacheClient
 	{
 		$sKey = '';
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
index f8694232a..ab9c83d5d 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
@@ -4,6 +4,35 @@ namespace RainLoop\Actions;
 
 trait Contacts
 {
+	/**
+	 * @var \RainLoop\Providers\AddressBook
+	 */
+	protected $oAddressBookProvider = null;
+
+	public function AddressBookProvider(?Model\Account $oAccount = null): Providers\AddressBook
+	{
+		if (null === $this->oAddressBookProvider) {
+			$oDriver = null;
+			try {
+//				if ($this->oConfig->Get('contacts', 'enable', false)) {
+				if ($this->GetCapa(Capa::CONTACTS)) {
+					$oDriver = $this->fabrica('address-book', $oAccount);
+				}
+				if ($oAccount && $oDriver) {
+					$oDriver->SetEmail($this->GetMainEmail($oAccount));
+					$oDriver->setDAVClientConfig($this->getContactsSyncData($oAccount));
+				}
+			} catch (\Throwable $e) {
+				\SnappyMail\LOG::error('AddressBook', $e->getMessage()."\n".$e->getTraceAsString());
+				$oDriver = null;
+//				$oDriver = new Providers\AddressBook\PdoAddressBook();
+			}
+			$this->oAddressBookProvider = new Providers\AddressBook($oDriver);
+			$this->oAddressBookProvider->SetLogger($this->oLogger);
+		}
+
+		return $this->oAddressBookProvider;
+	}
 
 	public function DoSaveContactsSyncData() : array
 	{