3 files changed, 9 insertions, 8 deletions
diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java
index b19889bf..5883788f 100644
--- a/src/eu/siacs/conversations/entities/Account.java
+++ b/src/eu/siacs/conversations/entities/Account.java
@@ -1,7 +1,6 @@
 package eu.siacs.conversations.entities;
 
 import java.security.interfaces.DSAPublicKey;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -68,7 +67,7 @@ public class Account  extends AbstractEntity{
 	
 	private Roster roster = null;
 
-	private List<Bookmark> bookmarks = new ArrayList<Bookmark>();
+	private List<Bookmark> bookmarks = new CopyOnWriteArrayList<Bookmark>();
 	
 	public List<Conversation> pendingConferenceJoins = new CopyOnWriteArrayList<Conversation>();
 	public List<Conversation> pendingConferenceLeaves = new CopyOnWriteArrayList<Conversation>();
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 76fe84cf..29eb22b9 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -1,8 +1,8 @@
 package eu.siacs.conversations.entities;
 
 import java.security.interfaces.DSAPublicKey;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import net.java.otr4j.OtrException;
 import net.java.otr4j.crypto.OtrCryptoEngineImpl;
@@ -43,7 +43,7 @@ public class Conversation extends AbstractEntity {
 
 	private String nextPresence;
 
-	private transient List<Message> messages = null;
+	private transient CopyOnWriteArrayList<Message> messages = null;
 	private transient Account account = null;
 
 	private transient SessionImpl otrSession;
@@ -85,8 +85,9 @@ public class Conversation extends AbstractEntity {
 	}
 
 	public List<Message> getMessages() {
-		if (messages == null)
-			this.messages = new ArrayList<Message>(); // prevent null pointer
+		if (messages == null) {
+			this.messages = new CopyOnWriteArrayList<Message>(); // prevent null pointer
+		}
 
 		// populate with Conversation (this)
 
@@ -133,7 +134,7 @@ public class Conversation extends AbstractEntity {
 		}
 	}
 
-	public void setMessages(List<Message> msgs) {
+	public void setMessages(CopyOnWriteArrayList<Message> msgs) {
 		this.messages = msgs;
 	}
 
diff --git a/src/eu/siacs/conversations/entities/MucOptions.java b/src/eu/siacs/conversations/entities/MucOptions.java
index 0bb9b295..3bce5111 100644
--- a/src/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/eu/siacs/conversations/entities/MucOptions.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.entities;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.xml.Element;
@@ -81,7 +82,7 @@ public class MucOptions {
 		}
 	}
 	private Account account;
-	private ArrayList<User> users = new ArrayList<User>();
+	private List<User> users = new CopyOnWriteArrayList<User>();
 	private Conversation conversation;
 	private boolean isOnline = false;
 	private int error = ERROR_ROOM_NOT_FOUND;