diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt
index a91f6c568a..4275a31990 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt
@@ -368,11 +368,7 @@ class MessageDetailsActivityTest : BaseMessageDetailsActivityTest() {
       PrivateKeysManager.getPgpKeyDetailsFromAssets("pgp/denbond7@flowcrypt.test_pub.asc")
     val email = requireNotNull(pgpKeyDetails.getPrimaryInternetAddress()).address
     onView(withId(R.id.textViewKeyOwnerTemplate)).check(
-      matches(
-        withText(
-          getResString(R.string.template_message_part_public_key_owner, email)
-        )
-      )
+      matches(withText(getResString(R.string.template_message_part_public_key_owner, email)))
     )
 
     onView(withId(R.id.textViewFingerprintTemplate)).check(
@@ -388,6 +384,10 @@ class MessageDetailsActivityTest : BaseMessageDetailsActivityTest() {
       )
     )
 
+    onView(withId(R.id.textViewManualImportWarning)).check(
+      matches(withText(getResString(R.string.warning_about_manual_import, email)))
+    )
+
     val block = msgInfo?.msgBlocks?.get(1) as PublicKeyMsgBlock
 
     onView(withId(R.id.textViewPgpPublicKey))
@@ -624,6 +624,8 @@ class MessageDetailsActivityTest : BaseMessageDetailsActivityTest() {
       .check(matches(withText(getResString(R.string.cannot_be_used_for_encryption))))
     onView(withId(R.id.buttonKeyAction))
       .check(matches(not(isDisplayed())))
+    onView(withId(R.id.textViewManualImportWarning))
+      .check(matches(not(isDisplayed())))
   }
 
   private fun testMissingKey(incomingMsgInfo: IncomingMessageInfo?) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
index 8721e2cfe7..f5298f7d61 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
@@ -1004,6 +1004,8 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi
     val existingRecipientWithPubKeys = block.existingRecipientWithPubKeys
     val button = pubKeyView.findViewById<Button>(R.id.buttonKeyAction)
     val textViewStatus = pubKeyView.findViewById<TextView>(R.id.textViewStatus)
+    val textViewManualImportWarning =
+      pubKeyView.findViewById<TextView>(R.id.textViewManualImportWarning)
     if (keyDetails?.usableForEncryption == true) {
       if (button != null) {
         if (existingRecipientWithPubKeys == null) {
@@ -1014,8 +1016,10 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi
           }
           if (matchingKeyByFingerprint != null) {
             if (keyDetails.isNewerThan(matchingKeyByFingerprint.pgpKeyDetails)) {
+              textViewManualImportWarning?.visible()
               initUpdatePubKeyButton(matchingKeyByFingerprint, keyDetails, button)
             } else {
+              textViewManualImportWarning?.gone()
               textViewStatus?.text = getString(R.string.already_imported)
               textViewStatus.visible()
               button.gone()
@@ -1028,6 +1032,7 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi
     } else {
       textViewStatus.text = getString(R.string.cannot_be_used_for_encryption)
       textViewStatus.setTextColor(UIUtil.getColor(requireContext(), R.color.red))
+      textViewManualImportWarning?.gone()
       textViewStatus.visible()
       button?.gone()
     }
diff --git a/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml b/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml
index b20e059ad1..991b33d1ca 100644
--- a/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml
@@ -20,6 +20,17 @@
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/textViewManualImportWarning"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:text="@string/manually_importing_public_keys_can_be_dangerous"
+        android:textColor="@color/orange"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toBottomOf="@+id/tVTitle" />
+
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tILKeyIdOrEmail"
         android:layout_width="0dp"
@@ -30,9 +41,9 @@
         android:layout_weight="1"
         android:hint="@string/search_by_key_id_or_email"
         android:orientation="horizontal"
-        app:layout_constraintEnd_toStartOf="@+id/iBSearchKey"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-        app:layout_constraintTop_toBottomOf="@+id/tVTitle">
+        app:layout_constraintTop_toBottomOf="@+id/textViewManualImportWarning">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/eTKeyIdOrEmail"
@@ -61,7 +72,7 @@
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/load_from_a_file"
-        android:theme="@style/AppWidget.Button.Green"
+        android:theme="@style/AppWidget.Button.Orange"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toBottomOf="@+id/tILKeyIdOrEmail" />
@@ -72,7 +83,7 @@
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/load_from_clipboard"
-        android:theme="@style/AppWidget.Button.Green"
+        android:theme="@style/AppWidget.Button.Orange"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toBottomOf="@+id/btLoadFromFile" />
diff --git a/FlowCrypt/src/main/res/layout/message_part_public_key.xml b/FlowCrypt/src/main/res/layout/message_part_public_key.xml
index 4848bd8eb2..864649cc20 100644
--- a/FlowCrypt/src/main/res/layout/message_part_public_key.xml
+++ b/FlowCrypt/src/main/res/layout/message_part_public_key.xml
@@ -34,6 +34,17 @@
         app:layout_constraintTop_toBottomOf="@+id/textViewKeyOwnerTemplate"
         tools:text="Fingerprint: XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX" />
 
+    <TextView
+        android:id="@+id/textViewManualImportWarning"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:text="@string/warning_about_manual_import"
+        android:textColor="@color/orange"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textViewFingerprintTemplate" />
+
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/switchShowPublicKey"
         android:layout_width="wrap_content"
@@ -46,7 +57,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewFingerprintTemplate" />
+        app:layout_constraintTop_toBottomOf="@+id/textViewManualImportWarning" />
 
     <TextView
         android:id="@+id/textViewPgpPublicKey"
@@ -82,7 +93,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
-        android:theme="@style/AppWidget.Button.Green"
+        android:theme="@style/AppWidget.Button.Orange"
         app:layout_constraintEnd_toEndOf="@+id/textViewFingerprintTemplate"
         app:layout_constraintStart_toStartOf="@+id/textViewFingerprintTemplate"
         app:layout_constraintTop_toBottomOf="@+id/textViewStatus"
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index 0dadc280ad..2321a90a81 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -543,4 +543,7 @@
     <string name="recipient_detail">Recipient details</string>
     <string name="you_trying_replace_pub_key_with_older_version">You are trying to replace a public key with an older version</string>
     <string name="cannot_be_used_for_encryption">Warning: cannot be used for encryption</string>
+    <string name="warning_about_manual_import">Manually importing Public Keys received over email can be dangerous.
+      Contact the sender to verify that the fingerprint matches.</string>
+    <string name="manually_importing_public_keys_can_be_dangerous">Manually importing Public Keys can be dangerous</string>
 </resources>
diff --git a/FlowCrypt/src/main/res/values/styles.xml b/FlowCrypt/src/main/res/values/styles.xml
index 3ea6c6684f..aec78a93aa 100644
--- a/FlowCrypt/src/main/res/values/styles.xml
+++ b/FlowCrypt/src/main/res/values/styles.xml
@@ -22,6 +22,11 @@
         <item name="colorButtonNormal">@color/colorPrimary</item>
     </style>
 
+    <style name="AppWidget.Button.Orange">
+        <item name="android:textColor">@android:color/white</item>
+        <item name="colorButtonNormal">@color/orange</item>
+    </style>
+
     <style name="AppWidget.Button.Green.WithDisabled" parent="Widget.MaterialComponents.Button">
         <item name="colorOnSurface">@color/dark</item>
     </style>