diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagePanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagePanel.java
index 123ec1535..d368d1fcc 100644
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagePanel.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagePanel.java
@@ -777,7 +777,6 @@ public int getCalloutWidth() {
 
     @Override
     public Dimension getMaximumSize() {
-        //return this.calloutPanelComponent1.getPreferredSize(); //To change body of generated methods, choose Tools | Templates.
         Dimension calloutPreferred= this.calloutPanelComponent1.getPreferredSize(); //To change body of generated methods, choose Tools | Templates.
         calloutPreferred.setSize(calloutPreferred.getWidth(), calloutPreferred.getHeight() + 8 + 18 + this.lblCaseContext.getPreferredSize().getHeight());
         return calloutPreferred;
@@ -785,7 +784,6 @@ public Dimension getMaximumSize() {
 
     @Override
     public Dimension getPreferredSize() {
-        //return this.calloutPanelComponent1.getPreferredSize();
         Dimension calloutPreferred= this.calloutPanelComponent1.getPreferredSize(); //To change body of generated methods, choose Tools | Templates.
         calloutPreferred.setSize(calloutPreferred.getWidth(), calloutPreferred.getHeight() + 8 + 18 + this.lblCaseContext.getPreferredSize().getHeight());
         return calloutPreferred;
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagingCenterPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagingCenterPanel.java
index d4f387d61..740d158d4 100644
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagingCenterPanel.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/messenger/MessagingCenterPanel.java
@@ -1027,7 +1027,6 @@ private void lstHashtagsValueChanged(javax.swing.event.ListSelectionEvent evt) {
             JScrollPane sp=(JScrollPane)this.tabsPane.getComponentAt(i);
             ((JPanel)sp.getViewport().getComponent(0)).removeAll();
         }
-        //this.pnlMessages.removeAll();
         List<String> selectedHashtags = this.lstHashtags.getSelectedValuesList();
         for (InstantMessage msg : this.currentMessageList) {
             if (selectedHashtags.isEmpty()) {
@@ -1047,10 +1046,6 @@ private void lstHashtagsValueChanged(javax.swing.event.ListSelectionEvent evt) {
         selPane.getComponent(0).repaint();
         selPane.doLayout();
         selPane.revalidate();
-        
-//        pnlMessages.repaint();
-//        this.jScrollPane3.doLayout();
-//        this.jScrollPane3.revalidate();
 
     }//GEN-LAST:event_lstHashtagsValueChanged
 
@@ -1117,7 +1112,6 @@ private void addToTabIfRequired(InstantMessage msg) {
             return;
         }
 
-        boolean hasTab = false;
         int existingTab = -1;
         for (int i = 0; i < this.tabsPane.getTabCount(); i++) {
             if (tabsPane.getTitleAt(i).equals(msg.getCaseContext().getFileNumber())) {
@@ -1184,12 +1178,7 @@ public void newMessageForSubmission(InstantMessage msg) {
         } catch (Exception ex) {
             log.error("Could not submit instant message to server", ex);
             JOptionPane.showMessageDialog(EditorsRegistry.getInstance().getMainWindow(), "Nachricht konnte nicht gesendet werden: " + ex.getMessage(), com.jdimension.jlawyer.client.utils.DesktopUtils.POPUP_TITLE_ERROR, JOptionPane.ERROR_MESSAGE);
-            return;
         }
-
-//        this.currentMessageList.add(msg);
-//        
-//        this.addMessageToView(msg);
     }
 
     @Override