diff --git a/programs/develop/tinypad/trunk/data/tp-defines.inc b/programs/develop/tinypad/trunk/data/tp-defines.inc
index 0a1ba2295c..b631c69c04 100644
--- a/programs/develop/tinypad/trunk/data/tp-defines.inc
+++ b/programs/develop/tinypad/trunk/data/tp-defines.inc
@@ -34,7 +34,6 @@ define mm.Options.Appearance   set_opt.dialog
 define mm.Options.SecureSel    set_opt.secure_sel
 define mm.Options.AutoBrackets set_opt.auto_braces
 define mm.Options.AutoIndents  set_opt.auto_indents
-define mm.Options.SmartTabs    0
 define mm.Options.OptimalFill  set_opt.optimal_fill
 define mm.Options.LineNumbers  set_opt.line_numbers
 define mm.Options.ZoomIn       key.ctrl_plus
diff --git a/programs/develop/tinypad/trunk/data/tp-idata.inc b/programs/develop/tinypad/trunk/data/tp-idata.inc
index 5f8a53a194..e30be9d668 100644
--- a/programs/develop/tinypad/trunk/data/tp-idata.inc
+++ b/programs/develop/tinypad/trunk/data/tp-idata.inc
@@ -112,7 +112,6 @@ sz ini_options_tabs_pos,'tabs_pos',0
 sz ini_options_secure_sel,'secure_sel',0
 sz ini_options_auto_braces,'auto_braces',0
 sz ini_options_auto_indent,'auto_indent',0
-sz ini_options_smart_tab,'smart_tab',0
 sz ini_options_optim_save,'optim_save',0
 sz ini_options_line_nums,'line_nums',0
 ;-----------------------------------------------------------------------------
diff --git a/programs/develop/tinypad/trunk/data/tp-locale.inc b/programs/develop/tinypad/trunk/data/tp-locale.inc
index 5055de0a43..1f5129f1fb 100644
--- a/programs/develop/tinypad/trunk/data/tp-locale.inc
+++ b/programs/develop/tinypad/trunk/data/tp-locale.inc
@@ -168,7 +168,6 @@ popup_res mm.Options,\
   ru,'�¥§®¯ á­®¥ ¢ë¤¥«¥­¨¥'	,'',SecureSel	,\
   ru,'€¢â®¬ â¨ç¥áª¨¥ ᪮¡ª¨'	,'',AutoBrackets,\
   ru,'€¢â®¬ â¨ç¥áª¨© ®âáâã¯'	,'',AutoIndents	,\
-  ru,'“¬­ ï â ¡ã«ïæ¨ï'		,'',SmartTabs	,\
   ru,'Ž¯â¨¬ «ì­®¥ á®åà ­¥­¨¥'	,'',OptimalFill	,\
   ru,'-','',,\
   ru,'‚­¥è­¨© ¢¨¤...'		,'',Appearance	,\
@@ -180,7 +179,6 @@ popup_res mm.Options,\
   en,'Secure selection'		,'',SecureSel	,\
   en,'Automatic brackets'	,'',AutoBrackets,\
   en,'Automatic indents'	,'',AutoIndents	,\
-  en,'Smart tabulation'		,'',SmartTabs	,\
   en,'Optimal fill on saving'	,'',OptimalFill	,\
   en,'-','',,\
   en,'Appearance...'		,'',Appearance	,\
@@ -192,7 +190,6 @@ popup_res mm.Options,\
   et,'Turvaline valimine'	,'',SecureSel	,\
   et,'Automaatsed sulud'	,'',AutoBrackets,\
   et,'Automaatsed taandread'	,'',AutoIndents	,\
-  et,'Tark tabulatsioon'	,'',SmartTabs	,\
   et,'Optimaalne täitmine salvestamisel','',OptimalFill,\
   et,'-','',,\
   et,'Välimus...'		,'',Appearance	,\
@@ -204,7 +201,6 @@ popup_res mm.Options,\
   sp,'Selección segura'		,'',SecureSel	,\
   sp,'Paréntesis automáticos'	,'',AutoBrackets,\
   sp,'Identación automática'	,'',AutoIndents	,\
-  sp,'Tabulación inteligente'	,'',SmartTabs	,\
   sp,'Llenado óptimo al guardar','',OptimalFill	,\
   sp,'-','',,\
   sp,'Apariencia...'		,'',Appearance
diff --git a/programs/develop/tinypad/trunk/data/tp-udata.inc b/programs/develop/tinypad/trunk/data/tp-udata.inc
index c80af05ab1..b3d9c94abb 100644
--- a/programs/develop/tinypad/trunk/data/tp-udata.inc
+++ b/programs/develop/tinypad/trunk/data/tp-udata.inc
@@ -126,7 +126,6 @@ tabs_pos  db ?
 secure_sel db ?
 auto_braces db ?
 auto_indent db ?
-smart_tab db ?
 optim_save db ?
 line_nums db ?
 
diff --git a/programs/develop/tinypad/trunk/tinypad.asm b/programs/develop/tinypad/trunk/tinypad.asm
index 2885f73c73..e1f2e406bc 100644
--- a/programs/develop/tinypad/trunk/tinypad.asm
+++ b/programs/develop/tinypad/trunk/tinypad.asm
@@ -383,8 +383,6 @@ proc load_settings ;//////////////////////////////////////////////////////////
 	mov	[auto_braces],al
 	invoke	ini.get_int,ini_path,ini_sec_options,ini_options_auto_indent,1
 	mov	[auto_indent],al
-	invoke	ini.get_int,ini_path,ini_sec_options,ini_options_smart_tab,1
-	mov	[smart_tab],al
 	invoke	ini.get_int,ini_path,ini_sec_options,ini_options_optim_save,1
 	mov	[optim_save],al
 	invoke	ini.get_int,ini_path,ini_sec_options,ini_options_line_nums,0
@@ -437,8 +435,6 @@ proc save_settings ;//////////////////////////////////////////////////////////
 	invoke	ini.set_int,ini_path,ini_sec_options,ini_options_auto_braces,eax
 	movzx	eax,[auto_indent]
 	invoke	ini.set_int,ini_path,ini_sec_options,ini_options_auto_indent,eax
-	movzx	eax,[smart_tab]
-	invoke	ini.set_int,ini_path,ini_sec_options,ini_options_smart_tab,eax
 	movzx	eax,[optim_save]
 	invoke	ini.set_int,ini_path,ini_sec_options,ini_options_optim_save,eax
 	movzx	eax,[line_nums]
diff --git a/programs/develop/tinypad/trunk/tp-popup.asm b/programs/develop/tinypad/trunk/tp-popup.asm
index b14342a21b..27c9b04fa9 100644
--- a/programs/develop/tinypad/trunk/tp-popup.asm
+++ b/programs/develop/tinypad/trunk/tp-popup.asm
@@ -258,28 +258,26 @@ onshow:
   .recode:
 	ret
   .options:
-	;mov     word[mm.Options+0],0
-	mov	byte[mm.Options+5],0
-	or	byte[mm.Options+2],0x02
-	test	[secure_sel],1
-	jnz	@f
-	and	byte[mm.Options+2],0xFD
-    @@: or	byte[mm.Options+3],0x02
-	test	[auto_braces],1
+	or	byte[mm.Options+3],0x02
+	test	[line_nums],1
 	jnz	@f
 	and	byte[mm.Options+3],0xFD
     @@: or	byte[mm.Options+4],0x02
-	test	[auto_indent],1
+	test	[secure_sel],1
 	jnz	@f
 	and	byte[mm.Options+4],0xFD
+    @@: or	byte[mm.Options+5],0x02
+	test	[auto_braces],1
+	jnz	@f
+	and	byte[mm.Options+5],0xFD
     @@: or	byte[mm.Options+6],0x02
-	test	[optim_save],1
+	test	[auto_indent],1
 	jnz	@f
 	and	byte[mm.Options+6],0xFD
-    @@: or	byte[mm.Options+8],0x02
-	test	[line_nums],1
+    @@: or	byte[mm.Options+7],0x02
+	test	[optim_save],1
 	jnz	@f
-	and	byte[mm.Options+8],0xFD
+	and	byte[mm.Options+7],0xFD
     @@: ret
 
 pi_sel	 dd ?