diff --git a/platform/external-system-api/resources/messages/ExternalSystemBundle.properties b/platform/external-system-api/resources/messages/ExternalSystemBundle.properties
index 96bbf66d7836..e586be193f0d 100644
--- a/platform/external-system-api/resources/messages/ExternalSystemBundle.properties
+++ b/platform/external-system-api/resources/messages/ExternalSystemBundle.properties
@@ -17,10 +17,6 @@ unlinked.project.notification.help.text=\
 
 untrusted.project.notification.execution.error={0} project is untrusted, so its task cannot be executed.
 
-untrusted.project.notification.trust.link=Trust project\u2026
-untrusted.project.notification.read.more.link=Read more
-untrusted.project.notification.description=Safe mode, limited functionality. Trust the project to access full IDE functionality.
-
 untrusted.project.notification.trust.button=Trust Project
 untrusted.project.notification.distrust.button=Stay in Safe Mode
 untrusted.project.notification.title=Trust {0} {1,choice,1#Project|1<Projects}?
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/UntrustedProjectNotificationProvider.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/UntrustedProjectNotificationProvider.kt
index 50f470d3a487..c27550085a1a 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/UntrustedProjectNotificationProvider.kt
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/UntrustedProjectNotificationProvider.kt
@@ -1,17 +1,14 @@
 // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.openapi.externalSystem.service.project
 
-import com.intellij.ide.impl.TRUSTED_PROJECTS_HELP_TOPIC
-import com.intellij.ide.impl.TrustChangeNotifier
-import com.intellij.ide.impl.TrustedProjectsStatistics
-import com.intellij.ide.impl.isTrusted
+import com.intellij.ide.IdeBundle
+import com.intellij.ide.impl.*
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.externalSystem.ExternalSystemManager
 import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder
 import com.intellij.openapi.externalSystem.model.ProjectSystemId
 import com.intellij.openapi.externalSystem.service.project.ExternalResolverIsSafe.executesTrustedCodeOnly
-import com.intellij.openapi.externalSystem.util.ExternalSystemBundle
 import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
 import com.intellij.openapi.externalSystem.util.ExternalSystemUtil.confirmLoadingUntrustedProject
 import com.intellij.openapi.fileEditor.FileEditor
@@ -35,20 +32,12 @@ class UntrustedProjectNotificationProvider : EditorNotifications.Provider<Editor
     if (providers.isEmpty()) {
       return null
     }
-    return EditorNotificationPanel(fileEditor).apply {
-      text = ExternalSystemBundle.message("untrusted.project.notification.description")
-      createActionLabel(ExternalSystemBundle.message("untrusted.project.notification.trust.link"), {
-        TrustedProjectsStatistics.TRUST_PROJECT_FROM_BANNER.log()
-        if (confirmLoadingUntrustedProject(project, providers.map { it.systemId })) {
-          for (provider in providers) {
-            provider.loadAllLinkedProjects(project)
-          }
+    return UntrustedProjectEditorNotificationPanel(fileEditor) {
+      if (confirmLoadingUntrustedProject(project, providers.map { it.systemId })) {
+        for (provider in providers) {
+          provider.loadAllLinkedProjects(project)
         }
-      }, false)
-      createActionLabel(ExternalSystemBundle.message("untrusted.project.notification.read.more.link"), {
-        TrustedProjectsStatistics.READ_MORE_FROM_BANNER.log()
-        HelpManager.getInstance().invokeHelp(TRUSTED_PROJECTS_HELP_TOPIC)
-      }, false)
+      }
     }
   }
 
diff --git a/platform/platform-api/resources/messages/IdeBundle.properties b/platform/platform-api/resources/messages/IdeBundle.properties
index 3ad4f0de2b52..6b532239b2d3 100644
--- a/platform/platform-api/resources/messages/IdeBundle.properties
+++ b/platform/platform-api/resources/messages/IdeBundle.properties
@@ -2520,6 +2520,9 @@ split.with.chooser.move.tab=Press %s to open%s
 split.with.chooser.duplicate.tab=, %s to duplicate
 split.with.chooser.switch.tab=Use %s to go to the next splitter
 
+untrusted.project.notification.description=Safe mode, limited functionality. Trust the project to access full IDE functionality.
+untrusted.project.notification.trust.link=Trust project\u2026
+untrusted.project.notification.read.more.link=Read more
 # {0} stands for something like github.com/JetBrains
 untrusted.project.warning.trust.host.checkbox=Trust {0}
 
diff --git a/platform/platform-impl/src/com/intellij/ide/impl/UntrustedProjectEditorNotificationPanel.kt b/platform/platform-impl/src/com/intellij/ide/impl/UntrustedProjectEditorNotificationPanel.kt
new file mode 100644
index 000000000000..6a88815bfdbf
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/impl/UntrustedProjectEditorNotificationPanel.kt
@@ -0,0 +1,22 @@
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.ide.impl
+
+import com.intellij.ide.IdeBundle
+import com.intellij.openapi.fileEditor.FileEditor
+import com.intellij.openapi.help.HelpManager
+import com.intellij.ui.EditorNotificationPanel
+
+class UntrustedProjectEditorNotificationPanel(fileEditor: FileEditor,
+                                              onTrustProjectLinkClicked: () -> Unit) : EditorNotificationPanel(fileEditor) {
+  init {
+    text = IdeBundle.message("untrusted.project.notification.description")
+    createActionLabel(IdeBundle.message("untrusted.project.notification.trust.link"), {
+      TrustedProjectsStatistics.TRUST_PROJECT_FROM_BANNER.log()
+      onTrustProjectLinkClicked()
+    }, false)
+    createActionLabel(IdeBundle.message("untrusted.project.notification.read.more.link"), {
+      TrustedProjectsStatistics.READ_MORE_FROM_BANNER.log()
+      HelpManager.getInstance().invokeHelp(TRUSTED_PROJECTS_HELP_TOPIC)
+    }, false)
+  }
+}
\ No newline at end of file