diff --git a/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java b/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java
index 07c5ec413..df1038eee 100644
--- a/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java
@@ -71,7 +71,7 @@ public void actionPerformed(ActionEvent e) {
 		} else if (menuItemName.equalsIgnoreCase("copy")) {
 			
 			JEditorPane editorPane 
-				= this.chatWindow.getConversationPanel()
+				= this.chatWindow.getCurrentConversationPanel()
 					.getChatEditorPane();
 			
 			if(editorPane.getSelectedText() == null){
diff --git a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java
index e73de77e8..843a3325c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java
@@ -176,7 +176,7 @@ public void actionPerformed(ActionEvent e) {
 		} else if (buttonText.equalsIgnoreCase("copy")) {
 			
 			JEditorPane editorPane 
-				= this.messageWindow.getConversationPanel()
+				= this.messageWindow.getCurrentConversationPanel()
 					.getChatEditorPane();
 			
 			if(editorPane.getSelectedText() == null){