diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
index 438b689c0..c087a5fa0 100644
--- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -55,13 +55,13 @@
         <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="4">
+    <Units Count="5">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="47" Y="18"/>
-        <UsageCount Value="113"/>
+        <UsageCount Value="116"/>
       </Unit0>
       <Unit1>
         <Filename Value="rxdbgridmainunit.pas"/>
@@ -72,30 +72,37 @@
         <UnitName Value="RxDBGridMainUnit"/>
         <TopLine Value="152"/>
         <CursorPos X="33" Y="171"/>
-        <UsageCount Value="113"/>
+        <UsageCount Value="116"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../rxdbgrid.pas"/>
-        <EditorIndex Value="2"/>
-        <TopLine Value="4637"/>
-        <CursorPos X="31" Y="4633"/>
-        <UsageCount Value="10"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="2489"/>
+        <CursorPos X="72" Y="2503"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../rxdbgridexportspreadsheet.pas"/>
         <UnitName Value="RxDBGridExportSpreadSheet"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
-        <TopLine Value="411"/>
-        <CursorPos X="5" Y="413"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="79"/>
+        <CursorPos Y="80"/>
+        <UsageCount Value="10"/>
+      </Unit3>
+      <Unit4>
+        <Filename Value="../../rxdconst.pas"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="100"/>
+        <CursorPos X="12" Y="121"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
-      </Unit3>
+      </Unit4>
     </Units>
-    <JumpHistory Count="3" HistoryIndex="2">
+    <JumpHistory Count="10" HistoryIndex="7">
       <Position1>
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="14" Column="134"/>
@@ -107,6 +114,34 @@
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="172" Column="21" TopLine="158"/>
       </Position3>
+      <Position4>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="4649" Column="19" TopLine="4638"/>
+      </Position4>
+      <Position5>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="114" Column="19" TopLine="82"/>
+      </Position5>
+      <Position6>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="163" TopLine="131"/>
+      </Position6>
+      <Position7>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="609" Column="21" TopLine="587"/>
+      </Position7>
+      <Position8>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="2502" Column="51" TopLine="2491"/>
+      </Position8>
+      <Position9>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="741" Column="33" TopLine="722"/>
+      </Position9>
+      <Position10>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="5423" Column="27" TopLine="5421"/>
+      </Position10>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/trunk/languages/rxdconst.es.po b/components/rx/trunk/languages/rxdconst.es.po
index a237f0fd2..2622a9e5f 100644
--- a/components/rx/trunk/languages/rxdconst.es.po
+++ b/components/rx/trunk/languages/rxdconst.es.po
@@ -470,6 +470,10 @@ msgstr "Hacia Delante"
 msgid "Text to find"
 msgstr "Texto a Buscar"
 
+#: rxdconst.srxdbgridoptimizecolwidth
+msgid "Optimize column width"
+msgstr ""
+
 #: rxdconst.srxdbgridselapplycaption
 #, fuzzy
 msgctxt "rxdconst.srxdbgridselapplycaption"
diff --git a/components/rx/trunk/languages/rxdconst.po b/components/rx/trunk/languages/rxdconst.po
index a3b7cb576..55f6e5481 100644
--- a/components/rx/trunk/languages/rxdconst.po
+++ b/components/rx/trunk/languages/rxdconst.po
@@ -456,6 +456,10 @@ msgstr ""
 msgid "Text to find"
 msgstr ""
 
+#: rxdconst.srxdbgridoptimizecolwidth
+msgid "Optimize column width"
+msgstr ""
+
 #: rxdconst.srxdbgridselapplycaption
 msgctxt "rxdconst.srxdbgridselapplycaption"
 msgid "Apply"
diff --git a/components/rx/trunk/languages/rxdconst.ru.po b/components/rx/trunk/languages/rxdconst.ru.po
index 1777808f7..838bc8809 100644
--- a/components/rx/trunk/languages/rxdconst.ru.po
+++ b/components/rx/trunk/languages/rxdconst.ru.po
@@ -466,6 +466,10 @@ msgstr "Вперёд"
 msgid "Text to find"
 msgstr "Текст для поиска"
 
+#: rxdconst.srxdbgridoptimizecolwidth
+msgid "Optimize column width"
+msgstr ""
+
 #: rxdconst.srxdbgridselapplycaption
 msgctxt "rxdconst.srxdbgridselapplycaption"
 msgid "Apply"
diff --git a/components/rx/trunk/languages/rxdconst.uk.po b/components/rx/trunk/languages/rxdconst.uk.po
index a72e38cb5..c95471c3e 100644
--- a/components/rx/trunk/languages/rxdconst.uk.po
+++ b/components/rx/trunk/languages/rxdconst.uk.po
@@ -468,6 +468,10 @@ msgstr "Вперед"
 msgid "Text to find"
 msgstr "Текст для пошуку"
 
+#: rxdconst.srxdbgridoptimizecolwidth
+msgid "Optimize column width"
+msgstr ""
+
 #: rxdconst.srxdbgridselapplycaption
 #, fuzzy
 msgctxt "rxdconst.srxdbgridselapplycaption"
diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index 71b1befd1..a4b5e2558 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -738,6 +738,7 @@ type
     procedure OnChooseVisibleFields(Sender: TObject);
     procedure OnSelectAllRows(Sender: TObject);
     procedure OnCopyCellValue(Sender: TObject);
+    procedure OnOptimizeColWidth(Sender: TObject);
     procedure Loaded; override;
     procedure UpdateFooterRowOnUpdateActive;
 
@@ -2499,6 +2500,7 @@ begin
   CreateToolMenuItem('W', sRxDBGridSelectColumns, @OnChooseVisibleFields);
   CreateToolMenuItem('A', sRxDBGridSelectAllRows, @OnSelectAllRows);
   CreateToolMenuItem(#0, sRxDBGridCopyCellValue, @OnCopyCellValue);
+  CreateToolMenuItem(#0, sRxDBGridOptimizeColWidth, @OnOptimizeColWidth);
 end;
 
 function TRxDBGrid.GetPropertyStorage: TCustomPropertyStorage;
@@ -5416,6 +5418,11 @@ begin
   end;
 end;
 
+procedure TRxDBGrid.OnOptimizeColWidth(Sender: TObject);
+begin
+  OptimizeColumnsWidthAll;
+end;
+
 procedure TRxDBGrid.Loaded;
 begin
   inherited Loaded;
diff --git a/components/rx/trunk/rxdconst.pas b/components/rx/trunk/rxdconst.pas
index 341b668a4..4c67e0687 100644
--- a/components/rx/trunk/rxdconst.pas
+++ b/components/rx/trunk/rxdconst.pas
@@ -108,16 +108,17 @@ resourcestring
   SFieldReadOnly           = 'SFieldReadOnly %s';
 
   //RXDBgrid
-  sRxDBGridFind            = 'Find data';  ////  'Buscar                              Ctrl+F';
-  sRxDBGridFilter          = 'Filter data';//'Filtrar                               Ctrl+T';
-  sRxDBGridFilterSimple    = 'Filter in table';//      Ctrl+E';  'Filtrar en Encabezado      Ctrl+E';
-  sRxDBGridFilterClear     = 'Clear filter';//                      Ctrl+Q';'Quitar Filtro                      Ctrl+Q';
-  sRxDBGridSortByColumns   = 'Sort data for columns';//     Ctrl+C';'Ordenar por Columnas     Ctrl+C';
-  sRxDBGridSelectColumns   = 'Select visible columns';//      Ctrl+W';'Seleccionar Columnas      Ctrl+W';
-  sRxDBGridEmptiFilter     = '(Empty)';
-  sRxDBGridAllFilter       = '(All values)';
-  sRxDBGridSelectAllRows   = 'Select all rows';//      Ctrl+W';'Seleccionar Columnas      Ctrl+W';
-  sRxDBGridCopyCellValue   = 'Copy cell value';//      Ctrl+W';'Seleccionar Columnas      Ctrl+W';
+  sRxDBGridFind               = 'Find data';
+  sRxDBGridFilter             = 'Filter data';
+  sRxDBGridFilterSimple       = 'Filter in table';
+  sRxDBGridFilterClear        = 'Clear filter';
+  sRxDBGridSortByColumns      = 'Sort data for columns';
+  sRxDBGridSelectColumns      = 'Select visible columns';
+  sRxDBGridEmptiFilter        = '(Empty)';
+  sRxDBGridAllFilter          = '(All values)';
+  sRxDBGridSelectAllRows      = 'Select all rows';
+  sRxDBGridCopyCellValue      = 'Copy cell value';
+  sRxDBGridOptimizeColWidth   = 'Optimize column width';
 
   //RxDBGrid filter form
   sRxFilterFormSelectExp   = 'Enter filter expression for data in table:';