diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index 461452de1e..1787c1dba8 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -354,11 +354,17 @@ public class ContactInfo {
             String domain = UriHelper.getEmailDomain(info.email);
 
             if (domain != null) {
+                // Prevent using Doodles
                 if ("google.com".equals(domain) ||
                         "gmail.com".equals(domain) ||
                         "googlemail.com".equals(domain))
                     domain = "support.google.com";
 
+                // https://yahoo.fr redirect unsafely to http://fr.yahoo.com/favicon.ico
+                String[] d = domain.split("\\.");
+                if (d.length > 1 && "yahoo".equals(d[d.length - 2]))
+                    domain = "yahoo.com";
+
                 File dir = new File(context.getCacheDir(), "favicons");
                 if (!dir.exists())
                     dir.mkdir();