diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html
index 6f257221b..cdc76a55e 100644
--- a/public/views/includes/transaction.html
+++ b/public/views/includes/transaction.html
@@ -22,7 +22,7 @@
             <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
           </span>
           <span ng-if="!tx.merchant">
-            <contact address="{{tx.toAddress}}"></contact>
+            {{index.addressbook[tx.toAddress] || tx.toAddress}}
           </span>
         </span>
       </div>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index a6948e125..c744823b9 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -321,7 +321,9 @@
 
               <div class="input">
                 <input ng-show="sendForm.address.$invalid" class="m0" type="text" id="address" name="address" ng-disabled="home.blockUx || home.lockAddress" ng-attr-placeholder="{{'Bitcoin address'|translate}}" ng-model="_address" valid-address required ng-focus="home.formFocus('address')" ng-blur="home.formFocus(false)">
-                <contact class="addressbook-input" ng-if="!sendForm.address.$invalid && _address" address="{{_address}}"></contact>
+                <div class="addressbook-input" ng-show="!sendForm.address.$invalid && _address">
+                  {{index.addressbook[_address] || _address}}
+                </div>
                 <a class="postfix size-12 m0 text-gray" 
                 ng-click="openDestinationAddressModal(index.otherWallets, _address)">
                   <i class="icon-wallet size-18"></i>
@@ -516,8 +518,7 @@
           <div class="size-14 text-gray columns m5t" ng-if="btx.message || btx.addressTo">
             <div ng-show="btx.message"><span translate>Note</span>: {{btx.message}}</div>
             <div ng-show="!btx.message">
-              <span translate>To</span>: 
-              <contact address="{{btx.addressTo}}"></contact>
+              <span translate>To</span>: {{index.addressbook[btx.addressTo] || btx.addressTo}} 
             </div>
           </div>
         </div>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 9da63404f..fc3c65c24 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -253,12 +253,6 @@ ul.copayer-list img {
   color: #A5B2BF;
 }
 
-.addresses .list-addr contact {
-  margin-left: 0;
-  font-size: 14px;
-}
-
-
 a.missing-copayers {
   bottom: -34px;
   text-align: center;
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index bf3f9b316..d57e89cec 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile) {
+angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
   var self = this;
   var SOFT_CONFIRMATION_LIMIT = 12;
   self.isCordova = isCordova;
@@ -111,6 +111,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.copayers = [];
       self.updateColor();
       self.updateAlias();
+      self.setAddressbook();
 
       self.initGlidera();
 
@@ -1007,12 +1008,26 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   };
 
+  self.setAddressbook = function() {
+    addressbookService.list(function(err, ab) {
+      if (err) {
+        $log.error('Error getting the addressbook');
+        return;
+      }
+      self.addressbook = ab;
+    }); 
+  };
+
   $rootScope.$on('Local/ClearHistory', function(event) {
     $log.debug('The wallet transaction history has been deleted');
     self.txHistory = [];
     self.updateHistory();
   });
 
+  $rootScope.$on('Local/AddressbookUpdated', function(event) {
+    self.setAddressbook();
+  });
+
   // UX event handlers
   $rootScope.$on('Local/ColorUpdated', function(event) {
     self.updateColor();
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index b79664e98..92781bd2a 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -272,6 +272,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
     modalInstance.result.finally(function() {
       $rootScope.modalOpened = false;
+      $rootScope.$emit('Local/AddressbookUpdated');
       disableCloseModal();
       var m = angular.element(document.getElementsByClassName('reveal-modal'));
       m.addClass(animationService.modalAnimated.slideOutDown);
diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js
index 478bd618b..f09f8bd23 100644
--- a/src/js/directives/directives.js
+++ b/src/js/directives/directives.js
@@ -174,10 +174,6 @@ angular.module('copayApp.directives')
             element.append(addr);
           }
         });
-
-        element.bind('click', function() {
-          selectText(element[0]);
-        });
       }
     };
   }])