diff --git a/docs/xml/lcl/dialogs.xml b/docs/xml/lcl/dialogs.xml
index 5a8100edf6..675e4a74bb 100644
--- a/docs/xml/lcl/dialogs.xml
+++ b/docs/xml/lcl/dialogs.xml
@@ -2781,7 +2781,19 @@ For each TModalResult a button is created. <br/>
 To set a custom caption, add a string after a button. You can use the special string parameters 'isdefault' and 'iscancel' to setup the default and cancel buttons.
 </p><p>The default TModalResults defined in controls.pp (mrNone..mrLast) don't need a caption. The default captions will be used.
 </p>
-        </descr>
+case QuestionDlg('COPYING',
+                   'Abort?',
+                   mtConfirmation,
+                   [mrNo, '&amp;No','IsDefault',
+                   mrYes,'&amp;Yes'],0) 
+of
+   mrYes : ShowMessage('You clicked Yes');
+   mrNo : ShowMessage('You clicked No');
+else
+  // mrCancel
+  ShowMessage('You cancelled the dialog.');
+end;
+</descr>
         <errors/>
         <seealso>
           <link id="MessageDlg"/>
diff --git a/lcl/include/promptdialog.inc b/lcl/include/promptdialog.inc
index 3ed4d97f6c..f529547af1 100644
--- a/lcl/include/promptdialog.inc
+++ b/lcl/include/promptdialog.inc
@@ -911,11 +911,32 @@ end;
 
 function QuestionDlg(const aCaption, aMsg: string; DlgType: TMsgDlgType;
             Buttons: array of const; HelpCtx: Longint): TModalResult;
+
+  function GetNextCaption(var i: integer; out aCaption: string): boolean;
+  begin
+    aCaption:='';
+    if (i > High(Buttons)) then exit(false);
+    Result:=true;
+    case Buttons[i].VType of
+      vtString: aCaption := Buttons[i].VString^;
+      vtAnsiString: aCaption := AnsiString(Buttons[i].VAnsiString);
+      vtChar: aCaption := Buttons[i].VChar;
+      vtPChar: aCaption := Buttons[i].VPChar;
+      vtPWideChar: aCaption := Buttons[i].VPWideChar;
+      vtWideChar: aCaption := AnsiString(Buttons[i].VWideChar);
+      vtWidestring: aCaption := AnsiString(WideString(Buttons[i].VWideString));
+    else
+      Result:=false;
+    end;
+    if Result then
+      inc(i);
+  end;
+
 var
   DialogButtons: TDialogButtons;
   i: integer;
   CurBtnValue: TModalResult;
-  CurBtnCaption, CurOptions: String;
+  CurBtnCaption, CurOptions, CurCaption: String;
   HasOptions: Boolean;
   IsDefault, IsCancel: Boolean;
   NewButton: TDialogButton;
@@ -934,71 +955,26 @@ begin
         CurBtnValue := Buttons[i].VInteger;
         inc(i);
 
-        // get button caption
+        // get button caption and flags
         CurBtnCaption := '';
-        if (i <= High(Buttons)) then
-        begin
-          case Buttons[i].VType of
-            vtString: CurBtnCaption := Buttons[i].VString^;
-            vtAnsiString: CurBtnCaption := AnsiString(Buttons[i].VAnsiString);
-            vtChar: CurBtnCaption := Buttons[i].VChar;
-            vtPChar: CurBtnCaption := Buttons[i].VPChar;
-            vtPWideChar: CurBtnCaption := Buttons[i].VPWideChar;
-            vtWideChar: CurBtnCaption := AnsiString(Buttons[i].VWideChar);
-            vtWidestring: CurBtnCaption := AnsiString(WideString(Buttons[i].VWideString));
-          else
-            dec(i); // prevent the following inc(i)
-          end;
-          inc(i);
-        end;
-
-        // get options
-        if (SysUtils.CompareText(CurBtnCaption,'isdefault')=0)
-        or (SysUtils.CompareText(CurBtnCaption,'iscancel')=0) then
-        begin
-          HasOptions := True;
-          CurOptions := CurBtnCaption;
-          CurBtnCaption := '';
-        end else
-        begin
-          CurOptions := '';
-          HasOptions := False;
-          if (i <= High(Buttons)) then
-          begin
-            HasOptions := True;
-            case Buttons[i].VType of
-              vtString: CurOptions := Buttons[i].VString^;
-              vtAnsiString: CurOptions := AnsiString(Buttons[i].VAnsiString);
-              vtChar: CurOptions := Buttons[i].VChar;
-              vtPChar: CurOptions := Buttons[i].VPChar;
-              vtPWideChar: CurOptions := Buttons[i].VPWideChar;
-              vtWideChar: CurOptions := AnsiString(Buttons[i].VWideChar);
-              vtWidestring: CurOptions := AnsiString(WideString(Buttons[i].VWideString));
-            else
-              HasOptions := False;
-              dec(i); // prevent the following inc(i)
-            end;
-            inc(i);
-          end;
-        end;
         IsDefault := False;
         IsCancel := False;
-        if HasOptions then
+        while GetNextCaption(i,CurCaption) do
         begin
-          if SysUtils.CompareText(CurOptions,'isdefault')=0 then
-          begin
+          if (SysUtils.CompareText(CurCaption,'isdefault')=0) then begin
             if DialogButtons.DefaultButton <> nil then
               raise Exception.Create('TQuestionDlg.CreateQuestionDlg only one button can be default');
-            IsDefault := True;
-          end else
-          if SysUtils.CompareText(CurOptions,'iscancel')=0 then
-          begin
+            IsDefault:=true;
+          end
+          else if (SysUtils.CompareText(CurCaption,'iscancel')=0) then begin
             if DialogButtons.CancelButton <> nil then
               raise Exception.Create('TQuestionDlg.CreateQuestionDlg only one button can be cancel');
-            IsCancel := True;
-          end else
-            raise Exception.Create('TQuestionDlg.CreateQuestionDlg option expected at '
-              +IntToStr(i)+' but "'+CurOptions+'" found.');
+            IsCancel:=true
+          end
+          else if CurBtnCaption='' then
+            CurBtnCaption:=CurCaption
+          else
+            raise Exception.Create('TQuestionDlg.CreateQuestionDlg option expected at '+IntToStr(i)+', but found "'+CurCaption+'"');
         end;
 
         if CurBtnCaption = '' then