diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index 8332bd0df..80163ca20 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -803,29 +803,26 @@ public void removeCallPanel(CallPanel callPanel)
     {
         this.tabbedPane.remove(callPanel);
         
-        if(getSelectedCallPanel() == null)
+        Component c = getSelectedPanel();
+        
+        if(c == null || !(c instanceof CallPanel))
             this.tabbedPane.setSelectedIndex(0);
         
         this.tabbedPane.revalidate();
     }
 
     /**
-     * If the selected component in the main tabbed pane is an instance of
-     * CallPanel returns it, otherwise returns null. 
+     * Returns the component contained in the currently selected tab.
      * @return the selected CallPanel or null if there's no CallPanel selected
      */
-    public CallPanel getSelectedCallPanel()
+    public Component getSelectedPanel()
     {
         Component c = this.tabbedPane.getSelectedComponent();
         
-        if(c != null && c instanceof CallPanel) {
-            return (CallPanel) c;
-        }
-        else {
-            return null;
-        }
+        return c;
     }
     
+    
     /**
      * Checks in the configuration xml if there is already stored index for
      * this provider and if yes, returns it, otherwise creates a new account
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
index 603d2ef73..707063e32 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
@@ -141,17 +141,18 @@ public void actionPerformed(ActionEvent evt)
         String buttonName = button.getName();
 
         if (buttonName.equals("call")) {
-            OperationSetBasicTelephony telephony;
             
             Object o = mainFrame.getContactListPanel().getContactList()
                 .getSelectedValue();
             
+            Component selectedPanel = mainFrame.getSelectedPanel();
             //call button is pressed over an already open call panel
-            if(mainFrame.getSelectedCallPanel() != null 
-                    && mainFrame.getSelectedCallPanel().getCall().getCallState()
+            if(selectedPanel != null
+                    && selectedPanel instanceof CallPanel
+                    && ((CallPanel)selectedPanel).getCall().getCallState()
                         == CallState.CALL_INITIALIZATION) {
             
-                CallPanel callPanel = mainFrame.getSelectedCallPanel();
+                CallPanel callPanel = (CallPanel) selectedPanel;
                 
                 Call call = callPanel.getCall();
                 
@@ -166,6 +167,21 @@ public void actionPerformed(ActionEvent evt)
                     answerCall(pps, participant);
                 }
             }
+            else if(selectedPanel != null
+                        && selectedPanel instanceof CallListPanel
+                        && ((CallListPanel) selectedPanel)
+                            .getCallList().getSelectedIndex() != -1) {
+                
+                CallListPanel callListPanel = (CallListPanel) selectedPanel;
+                
+                GuiCallParticipantRecord callRecord
+                    = (GuiCallParticipantRecord) callListPanel
+                        .getCallList().getSelectedValue();
+                
+                String stringContact = callRecord.getParticipantName();
+                
+                new CreateCallThread(stringContact).start();
+            }   
             //call button is pressed when a meta contact is selected
             else if(isCallMetaContact && o != null && o instanceof MetaContact) {
                 
@@ -187,23 +203,27 @@ else if(isCallMetaContact && o != null && o instanceof MetaContact) {
             //if no contact is selected checks if the user has chosen or has
             //writen something in the phone combo box
             else if(!phoneNumberCombo.isComboFieldEmpty()) {
+                String stringContact
+                    = phoneNumberCombo.getEditor().getItem().toString();
                 
-                new CreateCallThread().start();
+                new CreateCallThread(stringContact).start();
             }
         }
         else if (buttonName.equalsIgnoreCase("hangup")) {
-            CallPanel selectedCallPanel = this.mainFrame.getSelectedCallPanel();
+            Component selectedPanel = this.mainFrame.getSelectedPanel();
             
-            if(selectedCallPanel != null) {             
+            if(selectedPanel != null && selectedPanel instanceof CallPanel) {             
                 
-                Call call = selectedCallPanel.getCall();
+                CallPanel callPanel = (CallPanel) selectedPanel;
+                
+                Call call = callPanel.getCall();
                 
                 if(activeCalls.get(call) != null) {
                     
                     if(removeCallTimer.isRunning())
                         removeCallTimer.stop();
                     
-                    mainFrame.removeCallPanel(selectedCallPanel);
+                    mainFrame.removeCallPanel(callPanel);
                     
                     ProtocolProviderService pps
                         = call.getProtocolProvider();
@@ -417,7 +437,8 @@ public void stateChanged(ChangeEvent e)
      */
     private void updateButtonsStateAccordingToSelectedPanel()
     {
-        if(mainFrame.getSelectedCallPanel() != null) {            
+        Component selectedPanel = mainFrame.getSelectedPanel();
+        if(selectedPanel != null && selectedPanel instanceof CallPanel) {
             this.hangupButton.setEnabled(true);
         }
         else {
@@ -522,10 +543,13 @@ public void setCallMetaContact(boolean isCallMetaContact)
     private class CreateCallThread extends Thread
     {
         Contact contact;
+        String stringContact;
         OperationSetBasicTelephony telephony;
         
-        public CreateCallThread()
+        public CreateCallThread(String contact)
         {
+            this.stringContact = contact;
+            
             ProtocolProviderService pps
                 = getDefaultTelephonyProvider();
             
@@ -543,8 +567,12 @@ public CreateCallThread(Contact contact)
         public void run()
         {
             try {
-                Call createdCall = telephony.createCall(
-                    phoneNumberCombo.getEditor().getItem().toString());
+                Call createdCall;
+                
+                if(contact != null)
+                    createdCall = telephony.createCall(contact);
+                else    
+                    createdCall = telephony.createCall(stringContact);
                 
                 CallPanel callPanel = new CallPanel(CallManager.this, createdCall);