diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index 1a52fb56a..3143fabcf 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -43,6 +43,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
   vm.sendStatus = '';
   vm.thirdParty = false;
   vm.wallet = null;
+  vm.memoExpanded = false;
   
   var config = null;
   var defaults = {};
@@ -83,6 +84,12 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
           }
           vm.thirdParty.data['fromWalletId'] = vm.fromWalletId;
         }
+        if (vm.thirdParty.id === 'bip70') {
+          if (vm.thirdParty.memo) {
+            vm.memo = 'Payment request for BitPay invoice.\n' + toAddress + ' for merchant';
+            vm.memoExpanded = true;
+          }
+        }
       }
     }
 
@@ -321,7 +328,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
     txp.outputs = [{
       'toAddress': tx.toAddress,
       'amount': tx.amount,
-      'message': tx.description
+      'message': vm.memo
     }];
 
     if (tx.sendMaxInfo) {
@@ -333,7 +340,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
       } else txp.feeLevel = tx.feeLevel;
     }
 
-    txp.message = tx.description;
+    txp.message = vm.memo;
 
     if (tx.paypro) {
       txp.payProUrl = tx.paypro.url;
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index ffa3e95f1..be391edc3 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -422,7 +422,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
 
   function handlePayPro(payProDetails, coin) {
     var thirdPartyData = {
-      id: payProDetails.name,
+      id: 'bip70',
+      name: payProDetails.name,
       caName: payProDetails.caName,
       caTrusted: payProDetails.caTrusted,
       coin: coin,
diff --git a/www/css/main.css b/www/css/main.css
index c2e4325f9..87333d1a6 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -12093,7 +12093,7 @@ a.item {
       color: #fff; }
 
 .header.shapeshift {
-  background: url(../img/shapeshiftbg.jpg) center center no-repeat #28394d;
+  background: url(../img/shapeshiftbg.jpg) center center repeat #28394d;
   opacity: 0.99; }
 
 #bitpayCard {
diff --git a/www/views/review.html b/www/views/review.html
index 631d1bec4..0ad5e2148 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -7,8 +7,7 @@
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content class="padded-bottom-cta-with-summary bg-neutral"
-    ng-init="memoExpanded = false">
+  <ion-content class="padded-bottom-cta-with-summary bg-neutral">
     <div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
     <div class="header {{vm.origin.currency.toLowerCase()}}" ng-class="vm.thirdParty.id">
       <div class="content">
@@ -47,7 +46,13 @@
             <h2>{{vm.destination.name}}<span class="highlight" style="color: {{vm.destination.currencyColor}}" ng-if="vm.destination.currency"> ({{vm.destination.currency}})</span></h2></h2>
             <p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p>
           </div>
-          <div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address'">
+          <div class="item-content item-content-avatar"
+          ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70' && vm.thirdParty.name === 'bitpay'">
+            <img src="img/icon-bitpay.svg" class="bg">
+            <h2>BitPay</h2>
+            <p>Payment expired in XX:XX</p>
+          </div>
+          <div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address' && !vm.thirdParty">
             <div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded">
               <span class="prefix">{{vm.destination.address.substring(0,5)}}</span><span class="mid">{{vm.destination.address.substring(5,vm.destination.address.length-4)}}</span><span class="suffix">{{vm.destination.address.substring(vm.destination.address.length-4)}}</span>
             </div>
@@ -56,17 +61,17 @@
       </div>
       <div class="expand-content-frame">
         <div class="action-minor mt-negative text-right expand-content-trigger"
-          ng-class="{ 'expand-content-revealed': memoExpanded }"
-          ng-click="memoExpanded = !memoExpanded">
+          ng-class="{ 'expand-content-revealed': vm.memoExpanded }"
+          ng-click="vm.memoExpanded = !vm.memoExpanded">
           <img src="img/icon-bookmark.svg" class="action-icon">
           <span class="action-text">Add personal note</span>
         </div>
         <div class="card card-gutter-compact expand-content"
-          ng-class="{ 'expand-content-revealed': memoExpanded }">
+          ng-class="{ 'expand-content-revealed': vm.memoExpanded }">
           <div class="item item-compact" translate>Personal Note:</div>
           <div class="item">
             <div class="item-content">
-              <textarea elastic placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" class="elastic"></textarea>
+              <textarea elastic placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" class="elastic" ng-model="vm.memo"></textarea>
             </div>
           </div>
         </div>
diff --git a/www/views/walletSelector.html b/www/views/walletSelector.html
index 15b4935fa..eeb7591a8 100644
--- a/www/views/walletSelector.html
+++ b/www/views/walletSelector.html
@@ -5,7 +5,7 @@
   </ion-nav-bar>
   <ion-content>
     <div ng-if="thirdParty && thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
-    <div ng-if="thirdParty && thirdParty.id === 'bitpay'" ng-include="'views/thirdparty/bitpay-header.html'"></div>
+    <div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'bitpay'" ng-include="'views/thirdparty/bitpay-header.html'"></div>
     <div class="header--request" ng-if="isPaymentRequest">
       <div class="header--request__title" translate>Paying</div>
       <div class="header--request__amount" translate>{{requestAmount}} {{requestCurrency}}</div>