Merge branch 'trz/rename' into trz/rebase

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ad2c0b99..ce00fb0c 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1271,7 +1271,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
                         callback.onMoreMessagesLoaded(0, conversation);
                     }
 				} else {
-                        Logging.d("mam", ((!conversation.hasMessagesLeftOnServer()) ? "no" : "") + " more messages left on server, mam " + ((account.getXmppConnection().getFeatures().mam()) ? "" : "not") + " activated, account is " + ((account.isOnlineAndConnected()) ? "" : "not") + " online or connected)");
+                        Logging.d("mam", ((!conversation.hasMessagesLeftOnServer()) ? "no" : "")
+								+ " more messages left on server, mam "
+								+ ((account.isOnlineAndConnected() && account.getXmppConnection().getFeatures().mam()) ? "" : "not")
+								+ " activated, account is " + ((account.isOnlineAndConnected()) ? "" : "not")
+								+ " online or connected)");
                         callback.onMoreMessagesLoaded(0, conversation);
                         callback.informUser(R.string.no_more_history_on_server);
                     }