diff --git a/lib/bitcoin/bitcoin_wallet_service.dart b/lib/bitcoin/bitcoin_wallet_service.dart
index aefe0fadf..2cd3310fd 100644
--- a/lib/bitcoin/bitcoin_wallet_service.dart
+++ b/lib/bitcoin/bitcoin_wallet_service.dart
@@ -44,6 +44,7 @@ class BitcoinWalletService extends WalletService<
     final wallet = await BitcoinWalletBase.open(
         password: password, name: name, walletInfo: walletInfo);
     await wallet.init();
+    await wallet.updateAddressesInfo();
     return wallet;
   }
 
diff --git a/lib/bitcoin/electrum_wallet.dart b/lib/bitcoin/electrum_wallet.dart
index bf3dfd542..bb0ee3c3e 100644
--- a/lib/bitcoin/electrum_wallet.dart
+++ b/lib/bitcoin/electrum_wallet.dart
@@ -125,6 +125,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
 
     address = addresses[_accountIndex].address;
 
+    await updateAddressesInfo();
+
     await save();
   }
 
diff --git a/lib/bitcoin/litecoin_wallet_service.dart b/lib/bitcoin/litecoin_wallet_service.dart
index 053fd785f..071baf4af 100644
--- a/lib/bitcoin/litecoin_wallet_service.dart
+++ b/lib/bitcoin/litecoin_wallet_service.dart
@@ -45,6 +45,7 @@ class LitecoinWalletService extends WalletService<
     final wallet = await LitecoinWalletBase.open(
         password: password, name: name, walletInfo: walletInfo);
     await wallet.init();
+    await wallet.updateAddressesInfo();
     return wallet;
   }
 
diff --git a/lib/core/wallet_base.dart b/lib/core/wallet_base.dart
index ced918342..9e7b89e8d 100644
--- a/lib/core/wallet_base.dart
+++ b/lib/core/wallet_base.dart
@@ -66,4 +66,13 @@ abstract class WalletBase<
   Future<void> rescan({int height});
 
   void close();
+
+  Future<void> updateAddressesInfo() async {
+    try {
+      walletInfo.address = address;
+      await walletInfo.save();
+    } catch (e) {
+      print(e.toString());
+    }
+  }
 }
diff --git a/lib/di.dart b/lib/di.dart
index 37b6c5968..1f5350370 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -362,6 +362,7 @@ Future setup(
           AccountListItem, void>(
       (AccountListItem account, _) => MoneroAccountEditOrCreateViewModel(
           (getIt.get<AppStore>().wallet as MoneroWallet).accountList,
+          wallet: getIt.get<AppStore>().wallet,
           accountListItem: account));
 
   getIt.registerFactoryParam<MoneroAccountEditOrCreatePage, AccountListItem,
diff --git a/lib/entities/wallet_info.dart b/lib/entities/wallet_info.dart
index e29f60528..9dfb2011b 100644
--- a/lib/entities/wallet_info.dart
+++ b/lib/entities/wallet_info.dart
@@ -53,5 +53,8 @@ class WalletInfo extends HiveObject {
   @HiveField(8)
   String address;
 
+  @HiveField(10)
+  Map<String, String> addresses;
+
   DateTime get date => DateTime.fromMillisecondsSinceEpoch(timestamp);
 }
diff --git a/lib/monero/monero_wallet.dart b/lib/monero/monero_wallet.dart
index e902f1080..753dff53b 100644
--- a/lib/monero/monero_wallet.dart
+++ b/lib/monero/monero_wallet.dart
@@ -445,4 +445,26 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       print(e.toString());
     }
   }
+
+  @override
+  Future<void> updateAddressesInfo() async {
+    final Map<String, String> _addresses = {};
+    final _subaddressList = MoneroSubaddressList();
+
+    accountList.accounts.forEach((account) {
+      _subaddressList.update(accountIndex: account.id);
+      _subaddressList.subaddresses.forEach((subaddress) {
+        _addresses.addAll({subaddress.address:subaddress.label});
+      });
+    });
+
+    try {
+      walletInfo.addresses = _addresses;
+      walletInfo.address = address;
+
+      await walletInfo.save();
+    } catch (e) {
+      print(e.toString());
+    }
+  }
 }
diff --git a/lib/monero/monero_wallet_service.dart b/lib/monero/monero_wallet_service.dart
index 7795b8700..17b02dcbb 100644
--- a/lib/monero/monero_wallet_service.dart
+++ b/lib/monero/monero_wallet_service.dart
@@ -126,6 +126,7 @@ class MoneroWalletService extends WalletService<
       }
 
       await wallet.init();
+      await wallet.updateAddressesInfo();
 
       return wallet;
     } catch (e) {
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index bf2b593ee..fd126981a 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -151,17 +151,19 @@ class ContactListPage extends BasePage {
           crossAxisAlignment: CrossAxisAlignment.center,
           children: <Widget>[
             image ?? Offstage(),
-            Padding(
-              padding: image != null
-                  ? EdgeInsets.only(left: 12)
-                  : EdgeInsets.only(left: 0),
-              child: Text(
-                contact.name,
-                style: TextStyle(
-                    fontSize: 14,
-                    fontWeight: FontWeight.normal,
-                    color: Theme.of(context).primaryTextTheme.title.color),
-              ),
+            Expanded(
+              child: Padding(
+                padding: image != null
+                    ? EdgeInsets.only(left: 12)
+                    : EdgeInsets.only(left: 0),
+                child: Text(
+                  contact.name,
+                  style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.normal,
+                      color: Theme.of(context).primaryTextTheme.title.color),
+                ),
+              )
             )
           ],
         ),
diff --git a/lib/view_model/contact_list/contact_list_view_model.dart b/lib/view_model/contact_list/contact_list_view_model.dart
index 17083efe2..fd6196c89 100644
--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@@ -16,11 +16,23 @@ class ContactListViewModel = ContactListViewModelBase
 abstract class ContactListViewModelBase with Store {
   ContactListViewModelBase(this.contactSource, this.walletInfoSource)
       : contacts = ObservableList<ContactRecord>(),
-        walletContacts = walletInfoSource.values
-            .where((info) => info.address?.isNotEmpty ?? false)
-            .map((info) => WalletContact(
-                info.address, info.name, walletTypeToCryptoCurrency(info.type)))
-            .toList() {
+        walletContacts = [] {
+    walletInfoSource.values.forEach((info) {
+      if (info.address?.isNotEmpty ?? false) {
+        if (info.addresses != null) {
+          info.addresses.forEach((address, label) {
+            walletContacts.add(WalletContact(
+                address,
+                info.name + ' ($label)',
+                walletTypeToCryptoCurrency(info.type)));
+          });
+        } else {
+          walletContacts.add(WalletContact(info.address, info.name,
+              walletTypeToCryptoCurrency(info.type)));
+        }
+      }
+    });
+
     _subscription = contactSource.bindToListWithTransform(
         contacts, (Contact contact) => ContactRecord(contactSource, contact),
         initialFire: true);
diff --git a/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart b/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart
index d32f8eadd..cf999e414 100644
--- a/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart
+++ b/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/monero/monero_account_list.dart';
@@ -10,11 +12,12 @@ class MoneroAccountEditOrCreateViewModel = MoneroAccountEditOrCreateViewModelBas
 
 abstract class MoneroAccountEditOrCreateViewModelBase with Store {
   MoneroAccountEditOrCreateViewModelBase(this._moneroAccountList,
-      {AccountListItem accountListItem})
+      {@required WalletBase wallet, AccountListItem accountListItem})
       : state = InitialExecutionState(),
         isEdit = accountListItem != null,
         label = accountListItem?.label??'',
-        _accountListItem = accountListItem;
+        _accountListItem = accountListItem,
+        _wallet = wallet;
 
   final bool isEdit;
 
@@ -26,6 +29,7 @@ abstract class MoneroAccountEditOrCreateViewModelBase with Store {
 
   final MoneroAccountList _moneroAccountList;
   final AccountListItem _accountListItem;
+  final WalletBase _wallet;
 
   Future<void> save() async {
     try {
@@ -38,6 +42,8 @@ abstract class MoneroAccountEditOrCreateViewModelBase with Store {
         await _moneroAccountList.addAccount(label: label);
       }
 
+      await _wallet.updateAddressesInfo();
+
       state = ExecutedSuccessfullyState();
     } catch (e) {
       state = FailureState(e.toString());
diff --git a/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart
index b018c542d..6b6873cd5 100644
--- a/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart
+++ b/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart
@@ -54,6 +54,8 @@ abstract class WalletAddressEditOrCreateViewModelBase with Store {
         await _createNew();
       }
 
+      await _wallet.updateAddressesInfo();
+
       state = AddressSavedSuccessfully();
     } catch (e) {
       state = AddressEditOrCreateStateFailure(error: e.toString());
diff --git a/lib/view_model/wallet_creation_vm.dart b/lib/view_model/wallet_creation_vm.dart
index 58ee24087..54cad29c9 100644
--- a/lib/view_model/wallet_creation_vm.dart
+++ b/lib/view_model/wallet_creation_vm.dart
@@ -54,6 +54,7 @@ abstract class WalletCreationVMBase with Store {
       await _walletInfoSource.add(walletInfo);
       _appStore.changeCurrentWallet(wallet);
       _appStore.authenticationStore.allowed();
+      await wallet.updateAddressesInfo();
       state = ExecutedSuccessfullyState();
     } catch (e) {
       state = FailureState(e.toString());