diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb
index 126596204..22b46a1b2 100644
--- a/app/models/channel/email.rb
+++ b/app/models/channel/email.rb
@@ -65,6 +65,14 @@ class Channel::Email < ApplicationRecord
     imap_enabled && imap_address == 'imap.gmail.com'
   end
 
+  def obfuscated_imap_password
+    imap_password.present? ? '********' : nil
+  end
+
+  def obfuscated_smtp_password
+    smtp_password.present? ? '********' : nil
+  end
+
   private
 
   def ensure_forward_to_email
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 9cad3edc1..5427b1bda 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -67,7 +67,7 @@ if resource.email?
   ## IMAP
   if Current.account_user&.administrator?
     json.imap_login resource.channel.try(:imap_login)
-    json.imap_password resource.channel.try(:imap_password)
+    json.imap_password resource.channel.try(:obfuscated_imap_password)
     json.imap_address resource.channel.try(:imap_address)
     json.imap_port resource.channel.try(:imap_port)
     json.imap_enabled resource.channel.try(:imap_enabled)
@@ -81,7 +81,7 @@ if resource.email?
   ## SMTP
   if Current.account_user&.administrator?
     json.smtp_login resource.channel.try(:smtp_login)
-    json.smtp_password resource.channel.try(:smtp_password)
+    json.smtp_password resource.channel.try(:obfuscated_smtp_password)
     json.smtp_address resource.channel.try(:smtp_address)
     json.smtp_port resource.channel.try(:smtp_port)
     json.smtp_enabled resource.channel.try(:smtp_enabled)