diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 26c834c05f..825823bda6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2908,9 +2908,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private void bindExtras(TupleMessageEx message) {
             int resid = 0;
             if (infra && message.infrastructure != null) {
-                String resname = "infra_" + message.infrastructure;
-                resid = context.getResources()
-                        .getIdentifier(resname, "drawable", context.getPackageName());
+                if ("fairemail".equals(message.infrastructure))
+                    resid = R.mipmap.ic_launcher_round;
+                else {
+                    String resname = "infra_" + message.infrastructure;
+                    resid = context.getResources()
+                            .getIdentifier(resname, "drawable", context.getPackageName());
+                }
             }
             if (resid != 0)
                 ibInfrastructure.setImageResource(resid);
@@ -4970,9 +4974,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onActionShowInfra(TupleMessageEx message) {
-            String resname = "infra_" + message.infrastructure;
-            int resid = context.getResources()
-                    .getIdentifier(resname, "string", context.getPackageName());
+            int resid;
+            if ("fairemail".equals(message.infrastructure))
+                resid = R.string.app_name;
+            else {
+                String resname = "infra_" + message.infrastructure;
+                resid = context.getResources()
+                        .getIdentifier(resname, "string", context.getPackageName());
+            }
             String infra = (resid < 0 ? message.infrastructure : context.getString(resid));
             ToastEx.makeText(context, infra, Toast.LENGTH_LONG).show();
         }
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 01e69fb6c6..c856fd246e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2024,6 +2024,12 @@ public class MessageHelper {
                 return "flowmailer";
         }
 
+        if (BuildConfig.DEBUG) {
+            String fairemail = imessage.getHeader(HEADER_CORRELATION_ID, null);
+            if (!TextUtils.isEmpty(fairemail))
+                return "fairemail";
+        }
+
         return null;
     }
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 56f153c445..6fef51ee62 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -626,6 +626,7 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                 message.ui_hide = true;
                 message.ui_busy = Long.MAX_VALUE; // Needed to keep messages in user folders
                 message.error = null;
+                message.infrastructure = "fairemail";
                 message.id = db.message().insertMessage(message);
 
                 File file = EntityMessage.getFile(this, message.id);