diff --git a/resources/application.properties b/resources/application.properties
index 143557005..c2d8764c9 100644
--- a/resources/application.properties
+++ b/resources/application.properties
@@ -1,4 +1,5 @@
 applicationName=SIP Communicator
 applicationWebSite=http://sip-communicator.org
 fontName=Verdana
-fontSize=12
\ No newline at end of file
+fontSize=12
+isLookAndFeelDecorated=false
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index 4a962becd..1b1eef24f 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -792,6 +792,18 @@ private void setDefaultThemePack() {
         SIPCommLookAndFeel lf = new SIPCommLookAndFeel();
         SIPCommLookAndFeel.setCurrentTheme(new SIPCommDefaultTheme());
 
+        // Check the isLookAndFeelDecorated property and set the appropriate
+        // default decoration.
+        boolean isDecorated
+            = new Boolean(ApplicationProperties
+                .getProperty("isLookAndFeelDecorated")).booleanValue();
+
+        if (isDecorated)
+        {
+            JFrame.setDefaultLookAndFeelDecorated(true);
+            JDialog.setDefaultLookAndFeelDecorated(true);
+        }
+
         // we need to set the UIDefaults class loader so that it may access
         // resources packed inside OSGI bundles
         UIManager.put("ClassLoader", getClass().getClassLoader());