Index: webapp/src/main/java/info/magnolia/cms/gui/misc/Sources.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>windows-1252
===================================================================
--- webapp/src/main/java/info/magnolia/cms/gui/misc/Sources.java	(revision 454)
+++ webapp/src/main/java/info/magnolia/cms/gui/misc/Sources.java	(revision )
@@ -60,20 +60,32 @@
     }
 
     public String getHtmlJs() {
-        StringBuffer html = new StringBuffer();
+        return getHtmlJs(false);
+    }
 
+    public String getHtmlJs(boolean excludeCalendarResources) {
+        StringBuilder html = new StringBuilder();
+
         html.append("<script type=\"text/javascript\" src=\""); //$NON-NLS-1$
         html.append(contextPath);
         html.append("/.magnolia/pages/javascript.js\"></script>\n"); //$NON-NLS-1$
 
         html.append("<script type=\"text/javascript\" src=\""); //$NON-NLS-1$
         html.append(contextPath);
-        html.append("/.magnolia/pages/messages." + MgnlContext.getUser().getLanguage() + ".js\"></script>\n"); //$NON-NLS-1$
+        html.append("/.magnolia/pages/messages.").append(MgnlContext.getUser().getLanguage()).append(".js\"></script>\n"); //$NON-NLS-1$
 
         html.append("<script type=\"text/javascript\" src=\""); //$NON-NLS-1$
         html.append(contextPath);
         html.append("/.resources/admin-js/dialogs/dialogs.js\"></script>\n"); //$NON-NLS-1$
 
+        if (!excludeCalendarResources) {
+            appendCalendarResources(html);
+        }
+
+        return html.toString();
+    }
+
+    private void appendCalendarResources(final StringBuilder html) {
         html.append("<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"");
         html.append(contextPath);
         html.append("/.resources/calendar/skins/aqua/theme.css\" title=\"Aqua\" />\n");
@@ -91,12 +103,10 @@
         html.append("<script type=\"text/javascript\" src=\"");
         html.append(contextPath);
         html.append("/.resources/calendar/calendar-setup.js\"></script>\n");
-
-        return html.toString();
     }
 
     public String getHtmlCss() {
-        StringBuffer html = new StringBuffer();
+        StringBuilder html = new StringBuilder();
         html.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""); //$NON-NLS-1$
         html.append(contextPath);
         html.append("/.resources/admin-css/admin-all.css\" />\n"); //$NON-NLS-1$
Index: webapp/src/main/java/info/magnolia/templating/elements/InitElement.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>windows-1252
===================================================================
--- webapp/src/main/java/info/magnolia/templating/elements/InitElement.java	(revision 454)
+++ webapp/src/main/java/info/magnolia/templating/elements/InitElement.java	(revision )
@@ -97,11 +97,12 @@
         Sources src = new Sources(MgnlContext.getContextPath());
         MarkupHelper helper = new MarkupHelper(out);
         helper.append("<!-- begin js and css added by @cms.init -->\n");
-        helper.append("<meta name=\"gwt:property\" content=\"locale=" + i18nContentSupport.getLocale() +"\"/>\n");
+        helper.append("<meta name=\"gwt:property\" content=\"locale=").append(i18nContentSupport.getLocale().toString()).append("\"/>\n");
         helper.append(src.getHtmlCss());
-        helper.append(src.getHtmlJs());
-        helper.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + PAGE_EDITOR_CSS + "\"></link>\n");
-        helper.append("<script type=\"text/javascript\" src=\"" + PAGE_EDITOR_JS_SOURCE + "\"></script>\n");
+        // exclude calendar resources in edit mode, because of possible css and js conflicts
+        helper.append(src.getHtmlJs(true));
+        helper.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"").append(PAGE_EDITOR_CSS).append("\" />\n");
+        helper.append("<script type=\"text/javascript\" src=\"").append(PAGE_EDITOR_JS_SOURCE).append("\"></script>\n");
 
         try {
             if (content != null) {