From cf448cd1cc8d76bd08a6992a1ac83ee2f0057186 Mon Sep 17 00:00:00 2001
From: Ali Moghnieh <SupaHam.me@gmail.com>
Date: Tue, 3 Nov 2015 00:40:56 +0000
Subject: [PATCH] Always set the message sender's reply-recipient when they
 send a message.

---
 .../essentials/messaging/SimpleMessageRecipient.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java b/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
index b9f6d06e7..4558b6e4b 100644
--- a/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
+++ b/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
@@ -70,12 +70,9 @@ public class SimpleMessageRecipient implements IMessageRecipient {
             default:
                 sendMessage(tl("msgFormat", tl("me"), recipient.getDisplayName(), message));
         }
-
-        if (ess.getSettings().isLastMessageReplyRecipient()) {
-            // If the message was a success, set this sender's reply-recipient to the current recipient.
-            if (messageResponse.isSuccess()) {
-                setReplyRecipient(recipient);
-            }
+        // If the message was a success, set this sender's reply-recipient to the current recipient.
+        if (messageResponse.isSuccess()) {
+            setReplyRecipient(recipient);
         }
         return messageResponse;
     }