diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
index 0fa5e6d..d85deb3 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
@@ -279,10 +279,7 @@
             }
         } else {
             // Treat as normal list item; show call button, if possible.
-            boolean canPlaceCallToNumber =
-                    PhoneNumberUtil.canPlaceCallsTo(number, numberPresentation);
-
-            if (canPlaceCallToNumber) {
+            if (PhoneNumberUtil.canPlaceCallsTo(number, numberPresentation)) {
                 boolean isVoicemailNumber =
                         mTelecomCallLogCache.isVoicemailNumber(accountHandle, number);
                 if (isVoicemailNumber) {
@@ -364,7 +361,12 @@
             addToExistingContactButtonView.setVisibility(View.GONE);
         }
 
-        sendMessageView.setTag(IntentProvider.getSendSmsIntentProvider(number));
+        if (canPlaceCallToNumber) {
+            sendMessageView.setTag(IntentProvider.getSendSmsIntentProvider(number));
+            sendMessageView.setVisibility(View.VISIBLE);
+        } else {
+            sendMessageView.setVisibility(View.GONE);
+        }
 
         mCallLogListItemHelper.setActionContentDescriptions(this);
 
