diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 6de4bf10ecd3ef6d10d23ebcc499707b2aeaf51f..4bf8e5a705d183b32435256334b1c79f35266876 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -945,8 +945,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                             // the 'ringing' response. Responding with delivery receipts predates
                             // the 'ringing' spec'd
                             final boolean sendReceipts =
-                                    (mXmppConnectionService.confirmMessages()
-                                                    && contact.showInContactList())
+                                    contact.showInContactList()
                                             || Config.JINGLE_MESSAGE_INIT_STRICT_OFFLINE_CHECK;
                             if (remoteMsgId != null && !contact.isSelf() && sendReceipts) {
                                 processMessageReceipts(account, packet, remoteMsgId, null);
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 81389b748349e14ace259998d7593a1622b6740f..d8b8b4151cc9f19171c81f155b31f1ec24940ba5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1358,7 +1358,7 @@ public class ConversationFragment extends XmppFragment
                     && !unInitiatedButKnownSize
                     && t == null) {
                 copyMessage.setVisible(true);
-                quoteMessage.setVisible(!showError && MessageUtils.prepareQuote(m).length() > 0);
+                quoteMessage.setVisible(!showError && !MessageUtils.prepareQuote(m).isEmpty());
                 final String scheme = ShareUtil.getLinkScheme(m.getMergedBody());
                 if ("xmpp".equals(scheme)) {
                     copyLink.setTitle(R.string.copy_jabber_id);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 5f353ea2c488998f935d7a6757aa32945b76c033..3740b926f61eb6c0cc5a6c165295e7ed88e11ee5 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -1668,8 +1668,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
             // in environments where we always use discovery timeouts we always want to respond with
             // 'ringing'
             if (Config.JINGLE_MESSAGE_INIT_STRICT_DEVICE_TIMEOUT
-                    || (xmppConnectionService.confirmMessages()
-                            && id.getContact().showInContactList())) {
+                    || id.getContact().showInContactList()) {
                 sendJingleMessage("ringing");
             }
         } else {