diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
index c87279131..d1910ada6 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
@@ -12,6 +12,7 @@
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
 /**
@@ -43,7 +44,10 @@ public ChatSendPanel(ChatPanel chatPanel)
     {
         super(new BorderLayout(5, 0));
 
-        this.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
+        // MacOS would add a default border, so we just add a border for
+        // other operating systems.
+        if (!OSUtils.IS_MAC)
+            this.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
 
         sendButton = new JButton(
             GuiActivator.getResources().getI18NString("service.gui.SEND"));
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/StatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/StatusPanel.java
index 9ffd7db1c..150b38d46 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/StatusPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/StatusPanel.java
@@ -10,7 +10,6 @@
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -28,11 +27,9 @@ public StatusPanel()
     {
         super(new BorderLayout());
 
-        this.setPreferredSize(new Dimension(100, getFontHeight() + 10));
+        this.setPreferredSize(new Dimension(100, getFontHeight() + 5));
 
-        this.setBorder(BorderFactory.createCompoundBorder(
-            SIPCommBorders.getRoundBorder(),
-            BorderFactory.createEmptyBorder(3, 3, 3, 3)));
+        this.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
 
         this.add(statusLabel, BorderLayout.WEST);
     }