diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt b/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt
index 87f3d0805f..3f7bcf64c2 100644
--- a/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt
+++ b/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt
@@ -26,7 +26,7 @@ object Scrubber {
   private val E164_ZERO_PATTERN = Pattern.compile("\\b(KEEP_E164::)?0(\\d{10})\\b")
 
   /** The second group will be censored.*/
-  private val CRUDE_EMAIL_PATTERN = Pattern.compile("\\b([^\\s/])([^\\s/]*@[^\\s]+)")
+  private val CRUDE_EMAIL_PATTERN = Pattern.compile("\\b([^\\s/,()])([^\\s/,()]*@[^\\s]+\\.[^\\s]+)")
   private const val EMAIL_CENSOR = "...@..."
 
   /** The middle group will be censored. */
diff --git a/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt b/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt
index dd36538977..e98e7a5340 100644
--- a/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt
+++ b/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt
@@ -106,6 +106,10 @@ class ScrubberTest(private val input: String, private val expected: String) {
           "A short email a@def.com",
           "A short email a...@..."
         ),
+        arrayOf(
+          "This is not an email Success(result=org.whispersystems.signalservice.api.archive.ArchiveMediaResponse@1ea5e6)",
+          "This is not an email Success(result=org.whispersystems.signalservice.api.archive.ArchiveMediaResponse@1ea5e6)"
+        ),
         arrayOf(
           "A email with multiple parts before the @ d.c+b.a@mulitpart.domain.com and a multipart domain",
           "A email with multiple parts before the @ d...@... and a multipart domain"