diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -134,7 +134,9 @@
 
     // Pre-check input data for validity
     for (const SendCoinsRecipient &rcp : recipients) {
-        if (rcp.fSubtractFeeFromAmount) fSubtractFeeFromAmount = true;
+        if (rcp.fSubtractFeeFromAmount) {
+            fSubtractFeeFromAmount = true;
+        }
 
 #ifdef ENABLE_BIP70
         // PaymentRequest...
@@ -248,10 +250,12 @@
             vOrderForm.emplace_back("PaymentRequest", std::move(value));
         } else
 #endif
+        {
             if (!rcp.message.isEmpty()) {
-            // Message from normal bitcoincash:URI
-            // (bitcoincash:123...?message=example)
-            vOrderForm.emplace_back("Message", rcp.message.toStdString());
+                // Message from normal bitcoincash:URI
+                // (bitcoincash:123...?message=example)
+                vOrderForm.emplace_back("Message", rcp.message.toStdString());
+            }
         }
     }