aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/eu/siacs/conversations/entities')
-rw-r--r--src/eu/siacs/conversations/entities/Conversation.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 6eb688aea..0f4d24e59 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -116,7 +116,9 @@ public class Conversation extends AbstractEntity {
message.setTime(getCreated());
return message;
} else {
- return this.messages.get(this.messages.size() - 1);
+ Message message = this.messages.get(this.messages.size() - 1);
+ message.setConversation(this);
+ return message;
}
}