diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 57410032d..836651047 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -1188,9 +1188,9 @@ procedure RegisterRxDBGridSortEngine(RxDBGridSortEngineClass: TRxDBGridSortEngin
 
 implementation
 
-uses Math, rxdconst, rxstrutils, rxutils, strutils, rxdbgrid_findunit, Themes,
+uses Math, rxdateutil, rxdconst, rxstrutils, rxutils, strutils, rxdbgrid_findunit, Themes,
   rxdbgrid_columsunit, RxDBGrid_PopUpFilterUnit, rxlookup, rxtooledit, LCLProc,
-  Clipbrd, rxfilterby, rxsortby, variants, LazUTF8;
+  Clipbrd, rxfilterby, rxsortby, variants, LazUTF8, DateUtils;
 
 {$R rxdbgrid.res}
 
@@ -4164,21 +4164,40 @@ begin
   end
 end;
 
+function CompareDates(List: TStringList; Index1, Index: Integer): Integer;
+var
+  d1, d2: TDateTime;
+begin
+  TryStrToDateTime(List[Index1], d1);
+  TryStrToDateTime(List[Index], d2);
+  Result := -CompareDate(d1, d2);
+end;
+(*
+function CompareIntegers(List: TStringList; Index1, Index: Integer): Integer;
+var
+  d1, d2: Extended;
+begin
+  TryStrToFloat(List[Index1], d1);
+  TryStrToFloat(List[Index], d2);
+  Result := -CompareValue(d1, d2);
+end;
+*)
+
 procedure TRxDBGrid.FillFilterData;
 var
   i: Integer;
   C: TRxColumn;
   FBS, FAS: TDataSetNotifyEvent;
+
 begin
   for i := 0 to Columns.Count - 1 do
   begin
     C := TRxColumn(Columns[i]);
+    C.Filter.ValueList.SortStyle := sslAuto;
     C.Filter.ValueList.Clear;
     C.Filter.CurrentValues.Clear;
     C.Filter.ManulEditValue:='';
     C.Filter.ItemIndex := -1;
-    C.Filter.ValueList.Add(C.Filter.EmptyValue);
-    C.Filter.ValueList.Add(C.Filter.AllValue);
   end;
 
   if DatalinkActive then
@@ -4205,6 +4224,28 @@ begin
     DataSource.DataSet.AfterScroll:=FAS;
     DataSource.DataSet.EnableControls;
   end;
+
+  for i := 0 to Columns.Count - 1 do
+  begin
+    C := TRxColumn(Columns[i]);
+
+    if Assigned(C.Field) and (C.Field.DataType in DataTimeTypes) then
+    begin
+      C.Filter.ValueList.SortStyle := sslUser;
+      C.Filter.ValueList.CustomSort(@CompareDates);
+    end
+{    else
+    if Assigned(C.Field) and (C.Field.DataType in NumericDataTypes) then
+    begin
+      C.Filter.ValueList.SortStyle := sslUser;
+      C.Filter.ValueList.CustomSort(@CompareIntegers);
+    end};
+
+    C.Filter.ValueList.SortStyle := sslNone;
+    C.Filter.ValueList.Insert(0, C.Filter.AllValue);
+    C.Filter.ValueList.Insert(0, C.Filter.EmptyValue);
+  end;
+
 end;
 
 procedure TRxDBGrid.DefaultDrawCellA(aCol, aRow: integer; aRect: TRect;
diff --git a/components/rx/trunk/rxdb/rxdbutils.pas b/components/rx/trunk/rxdb/rxdbutils.pas
index 8c042b24f..e0aee9bee 100644
--- a/components/rx/trunk/rxdb/rxdbutils.pas
+++ b/components/rx/trunk/rxdb/rxdbutils.pas
@@ -43,7 +43,7 @@ const
 
   NumericDataTypes = IntegerDataTypes + [ftFloat, ftCurrency, ftBCD];
 
-  DataTimeTypes = [ftTime, ftDateTime, ftTimeStamp];
+  DataTimeTypes = [ftTime, ftDateTime, ftTimeStamp, ftDate];
 
   StringTypes = [ftString, {ftMemo,} ftFixedChar, ftWideString, ftFixedWideChar, ftWideMemo];
 
diff --git a/components/rx/trunk/rxtools/rxdateutil.pas b/components/rx/trunk/rxtools/rxdateutil.pas
index 714948811..20bb073fe 100644
--- a/components/rx/trunk/rxtools/rxdateutil.pas
+++ b/components/rx/trunk/rxtools/rxdateutil.pas
@@ -99,7 +99,7 @@ const
 
 implementation
 
-uses SysUtils, RXStrUtils, rxdconst{, DBConsts }{$IFDEF WIN32}, Windows{$ENDIF};
+uses DateUtils, SysUtils, RXStrUtils, rxdconst{, DBConsts }{$IFDEF WIN32}, Windows{$ENDIF};
 
 
 function NvlDate(DateValue, DefaultValue: TDateTime): TDateTime;
@@ -436,7 +436,7 @@ begin
   DateOrder := GetDateOrder(DateFormat);
   if DefaultFormatSettings.ShortDateFormat[1] = 'g' then { skip over prefix text }
     ScanToNumber(S, Pos);
-  if not (ScanNumber(S, MaxInt, Pos, N1) and ScanChar(S, Pos, DateSeparator) and
+  if not (ScanNumber(S, MaxInt, Pos, N1) and ScanChar(S, Pos, DefaultFormatSettings.DateSeparator) and
     ScanNumber(S, MaxInt, Pos, N2)) then Exit;
   if ScanChar(S, Pos, DateSeparator) then begin
     if not ScanNumber(S, MaxInt, Pos, N3) then Exit;
@@ -642,6 +642,7 @@ begin
 end;
 {$ENDIF}
 
+
 {$IFDEF USE_FOUR_DIGIT_YEAR}
 initialization
   FourDigitYear := Pos('YYYY', AnsiUpperCase(ShortDateFormat)) > 0;