From 0e704d1f013485bbcb94c9c3a6aaf9c4cb0bd5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Mon, 29 Mar 2021 14:05:08 +0200
Subject: [PATCH] Try to find our correct identity when replying to event
 invites

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3995dc094c..6a85766525 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2877,6 +2877,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                 ev.setDateEnd(event.getDateEnd());
 
                             InternetAddress to = (InternetAddress) message.to[0];
+                            EntityIdentity identity = db.identity().getIdentity(message.identity);
+                            for (Address recipient: message.to) {
+                                if (identity.similarAddress(recipient)) {
+                                    to = (InternetAddress) recipient;
+                                    break;
+                                }
+                            }
                             Attendee attendee = new Attendee(to.getPersonal(), to.getAddress());
 
                             if (action == R.id.btnCalendarAccept) {