diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
index a57fa24d..50a62cb5 100644
--- a/out/locale/en/LC_MESSAGES/default.po
+++ b/out/locale/en/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2012-11-29 19:10+0100\n"
+"PO-Revision-Date: 2012-11-29 23:40+0100\n"
 "Last-Translator: Ansgar Becker <heidisql@anse.de>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
 "language/en/)\n"
@@ -5482,3 +5482,43 @@ msgstr "Column #%d not available. Query returned %d columns and %d rows."
 #: main.pas:1188
 msgid "Unhandled sender control: %s"
 msgstr "Unhandled sender control: %s"
+
+#. Message dialogs
+msgid "Error"
+msgstr "Error"
+
+#. Message dialogs
+msgid "Confirm"
+msgstr "Confirm"
+
+#. Message dialogs
+msgid "Warning"
+msgstr "Warning"
+
+#. Message dialogs
+msgid "Information"
+msgstr "Information"
+
+#. Message dialogs
+msgid "Abort"
+msgstr "Abort"
+
+#. Message dialogs
+msgid "Retry"
+msgstr "Retry"
+
+#. Message dialogs
+msgid "Ignore"
+msgstr "Ignore"
+
+#. Message dialogs
+msgid "All"
+msgstr "All"
+
+#. Message dialogs
+msgid "No to all"
+msgstr "No to all"
+
+#. Message dialogs
+msgid "Yes to all"
+msgstr "Yes to all"
diff --git a/source/helpers.pas b/source/helpers.pas
index aa2a9605..cb638f58 100644
--- a/source/helpers.pas
+++ b/source/helpers.pas
@@ -2417,15 +2417,62 @@ end;
 function MessageDialog(const Title, Msg: string; DlgType: TMsgDlgType; Buttons: TMsgDlgButtons): Integer;
 var
   m: String;
+  Dialog: TTaskDialog;
+  Btn: TTaskDialogButtonItem;
+  DialogResult: TModalResult;
+  MsgButton: TMsgDlgBtn;
+
+  procedure AddButton(BtnCaption: String; BtnResult: TModalResult);
+  begin
+    Btn := TTaskDialogButtonItem(Dialog.Buttons.Add);
+    Btn.Caption := _(BtnCaption);
+    Btn.ModalResult := BtnResult;
+  end;
 begin
- if (Win32MajorVersion >= 6) and (Title <> '') then
-   Result := TaskMessageDlg(Title, Msg, DlgType, Buttons, 0)
- else begin
-   m := Msg;
-   if Title <> '' then
-     m := Title + CRLF + CRLF + m;
-   Result := MessageDlg(m, DlgType, Buttons, 0);
- end;
+  if Win32MajorVersion >= 6 then begin
+    Dialog := TTaskDialog.Create(nil);
+    case DlgType of
+      mtWarning: Dialog.Caption := _('Warning');
+      mtError: Dialog.Caption := _('Error');
+      mtInformation: Dialog.Caption := _('Information');
+      mtConfirmation: Dialog.Caption := _('Confirm');
+    end;
+    if Title <> Dialog.Caption then
+      Dialog.Title := Title;
+    Dialog.Text := Msg;
+    Dialog.Flags := [tfEnableHyperlinks, tfAllowDialogCancellation];
+    Dialog.CommonButtons := [];
+    case DlgType of
+      mtWarning:      Dialog.MainIcon := tdiWarning;
+      mtError:        Dialog.MainIcon := tdiError;
+      mtInformation:  Dialog.MainIcon := tdiInformation;
+      mtConfirmation: Dialog.MainIcon := tdiInformation;
+      else            Dialog.MainIcon := tdiNone;
+    end;
+    for MsgButton in Buttons do begin
+      case MsgButton of
+        mbYes:       AddButton('Yes', mrYes);
+        mbNo:        AddButton('No', mrNo);
+        mbOK:        AddButton('OK', mrOk);
+        mbCancel:    AddButton('Cancel', mrCancel);
+        mbAbort:     AddButton('Abort', mrAbort);
+        mbRetry:     AddButton('Retry', mrRetry);
+        mbIgnore:    AddButton('Ignore', mrIgnore);
+        mbAll:       AddButton('All', mrAll);
+        mbNoToAll:   AddButton('No to all', mrNoToAll);
+        mbYesToAll:  AddButton('Yes to all', mrYesToAll);
+        mbClose:     AddButton('Close', mrClose);
+      end;
+    end;
+    Dialog.Execute;
+    Result := Dialog.ModalResult;
+    Dialog.Free;
+  end else begin
+    m := Msg;
+    if Title <> '' then
+      m := Title + CRLF + CRLF + m;
+    Result := MessageDlg(m, DlgType, Buttons, 0);
+  end;
 end;