Index: magnolia-gui/src/main/java/info/magnolia/cms/gui/dialog/Dialog.java
===================================================================
--- magnolia-gui/src/main/java/info/magnolia/cms/gui/dialog/Dialog.java	(revision 50247)
+++ magnolia-gui/src/main/java/info/magnolia/cms/gui/dialog/Dialog.java	(working copy)
@@ -257,7 +257,7 @@
 
         Button save = new Button();
         String saveOnclick = this.getConfigValue("saveOnclick", "mgnlDialogFormSubmit();");
-        String saveLabel = this.getConfigValue("saveLabel", msgs.get("buttons.save"));
+        String saveLabel = msgs.get(this.getConfigValue("saveLabel", "buttons.save"));
         if (StringUtils.isNotEmpty(saveOnclick) && StringUtils.isNotEmpty("saveLabel")) {
             save.setId("mgnlSaveButton");
             save.setOnclick(saveOnclick);
@@ -267,7 +267,7 @@
         Button cancel = new Button();
         cancel.setId("mgnlCancelButton");
         cancel.setOnclick(this.getConfigValue("cancelOnclick", "window.close();")); //$NON-NLS-1$ //$NON-NLS-2$
-        cancel.setLabel(this.getConfigValue("cancelLabel", msgs.get("buttons.cancel"))); //$NON-NLS-1$ //$NON-NLS-2$
+        cancel.setLabel(msgs.get(this.getConfigValue("cancelLabel", "buttons.cancel"))); //$NON-NLS-1$ //$NON-NLS-2$
         out.write(cancel.getHtml());
 
         out.write("</div>\n"); //$NON-NLS-1$