From e79f364e1d5e7348ef5e2fea7f4d1578f4ec59d1 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 22 Jun 2018 14:03:09 +0200
Subject: [PATCH] Only ignore our own stale devices

---
 .../main/java/org/jivesoftware/smackx/omemo/OmemoService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index 3fde065bc..cb329f488 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -385,8 +385,8 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                 }
             }
 
-            // Ignore stale devices
-            if (OmemoConfiguration.getIgnoreStaleDevices()) {
+            // Ignore own stale devices
+            if (contactsDevice.getJid().equals(userDevice.getJid()) && OmemoConfiguration.getIgnoreStaleDevices()) {
 
                 Date lastMessageDate = getOmemoStoreBackend().getDateOfLastReceivedMessage(userDevice, contactsDevice);
                 if (lastMessageDate == null) {