Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4

Conflicts:
	build.gradle
	src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/res/values/arrays.xml

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 92eaa706..f800def1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -177,6 +177,14 @@ public class Message extends AbstractEntity {
 		return message;
 	}
 
+	public static Message createLoadMoreMessage(Conversation conversation) {
+		final Message message = new Message();
+		message.setType(Message.TYPE_STATUS);
+		message.setConversation(conversation);
+		message.setBody("LOAD_MORE");
+		return message;
+	}
+
 	@Override
 	public ContentValues getContentValues() {
 		ContentValues values = new ContentValues();