diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 2ac3e1df..a61d756a 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -14,8 +14,8 @@
 <prefpane id="prefpane-appearance" label="&config.tabs.appearance;"
 	onpaneload="onChangeTabbarPosition();">
 	<preferences>
-		<preference id="extensions.treestyletab.tabbar.scroll.smooth"
-			name="extensions.treestyletab.tabbar.scroll.smooth"
+		<preference id="extensions.treestyletab.animation.enabled"
+			name="extensions.treestyletab.animation.enabled"
 			type="bool"/>
 		<preference id="extensions.treestyletab.tabbar.position"
 			name="extensions.treestyletab.tabbar.position"
@@ -50,9 +50,9 @@
 
 	<vbox>
 
-	<checkbox id="extensions.treestyletab.tabbar.scroll.smooth-check"
-		preference="extensions.treestyletab.tabbar.scroll.smooth"
-		label="&config.tabbar.scroll.smooth;"/>
+	<checkbox id="extensions.treestyletab.animation.enabled-check"
+		preference="extensions.treestyletab.animation.enabled"
+		label="&config.animation.enabled;"/>
 	<groupbox>
 		<caption label="&config.tabbar.position.caption;"/>
 		<vbox>
diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index 4b63ab68..d3aabc63 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -100,6 +100,9 @@ var TreeStyleTabService = {
 	baseIndent : 12,
 	shouldDetectClickOnIndentSpaces : true,
 
+	smoothScrollEnabled : true,
+	smoothScrollDelay   : 150,
+
 	animationEnabled : true,
 	indentDelay      : 200,
 	collapseDelay    : 150,
@@ -1062,6 +1065,8 @@ var TreeStyleTabService = {
 		this.observe(null, 'nsPref:changed', 'browser.link.open_newwindow.restriction.override');
 		this.observe(null, 'nsPref:changed', 'browser.tabs.loadFolderAndReplace.override');
 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.tabbar.style');
+		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.tabbar.scroll.smooth');
+		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.tabbar.scroll.delay');
 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.animation.enabled');
 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.animation.indent.delay');
 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.animation.collapse.delay');
@@ -2172,6 +2177,13 @@ catch(e) {
 				this.shouldDetectClickOnIndentSpaces = this.getPref(aPrefName);
 				break;
 
+			case 'extensions.treestyletab.tabbar.scroll.smooth':
+				this.smoothScrollEnabled = value;
+				break;
+			case 'extensions.treestyletab.tabbar.scroll.delay':
+				this.smoothScrollDelay = value;
+				break;
+
 			case 'extensions.treestyletab.animation.enabled':
 				this.animationEnabled = value;
 				break;
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index f3a39bd1..cbaeaeeb 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -3234,7 +3234,7 @@ TreeStyleTabBrowser.prototype = {
 	
 	scrollTo : function(aEndX, aEndY) 
 	{
-		if (this.getTreePref('tabbar.scroll.smooth')) {
+		if (this.animationEnabled || this.smoothScrollEnabled) {
 			this.smoothScrollTo(aEndX, aEndY);
 		}
 		else {
@@ -3284,7 +3284,7 @@ TreeStyleTabBrowser.prototype = {
 		};
 		window['piro.sakura.ne.jp'].animationManager.addTask(
 			this.smoothScrollTask,
-			0, 0, this.getTreePref('tabbar.scroll.timeout')
+			0, 0, this.smoothScrollDelay
 		);
 	},
 	smoothScrollTask : null,
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index 0b39bc32..dfe7e94f 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -12,7 +12,7 @@ pref("extensions.treestyletab.tabbar.invertUI",        true);
 pref("extensions.treestyletab.tabbar.hideNewTabButton", false);
 pref("extensions.treestyletab.tabbar.hideAlltabsButton", true);
 pref("extensions.treestyletab.tabbar.scroll.smooth",   true);
-pref("extensions.treestyletab.tabbar.scroll.timeout",  250);
+pref("extensions.treestyletab.tabbar.scroll.delay",    250);
 // default, vertigo, mixed
 pref("extensions.treestyletab.tabbar.style",           "mixed");
 // 0 = disabled, 1 = hide, 2 = shrink
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index 3689b03d..5595a310 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "Darstellung">
 
-<!ENTITY config.tabbar.scroll.smooth "Tableiste weich scrollen">
+<!ENTITY config.animation.enabled "Aktivieren Sie Animationseffekte">
 
 <!ENTITY config.tabbar.position.caption "Position der Tableiste">
 <!ENTITY config.tabbar.position.left    "Links">
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 117600ff..bb076fc0 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "Appearance">
 
-<!ENTITY config.tabbar.scroll.smooth "Scroll the tab bar smoothly">
+<!ENTITY config.animation.enabled "Enable Animation Effects">
 
 <!ENTITY config.tabbar.position.caption "Tab bar position">
 <!ENTITY config.tabbar.position.left    "Leftside">
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 68cc56fd..898ceb6c 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "Apariencia">
 
-<!ENTITY config.tabbar.scroll.smooth "Desplazar la barra de pestañas suavemente">
+<!ENTITY config.animation.enabled "Activar los efectos de animación">
 
 <!ENTITY config.tabbar.position.caption "Posición de la barra de pestañas">
 <!ENTITY config.tabbar.position.left    "Lado izquierdo">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index a78c6fdc..061780bd 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "Aspetto">
 
-<!ENTITY config.tabbar.scroll.smooth "Scorri gradualmente la barra delle schede">
+<!ENTITY config.animation.enabled "Abilita effetti di animazione">
 
 <!ENTITY config.tabbar.position.caption "Posiziona barra delle schede">
 <!ENTITY config.tabbar.position.left    "sul lato sinistro">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index a16ea631..f1676760 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "外観">
 
-<!ENTITY config.tabbar.scroll.smooth "タブバーをなめらかにスクロールする">
+<!ENTITY config.animation.enabled "アニメーション効果を有効にする">
 
 <!ENTITY config.tabbar.position.caption "タブバーの表示位置">
 <!ENTITY config.tabbar.position.left    "左">
diff --git a/locale/ru-RU/treestyletab/treestyletab.dtd b/locale/ru-RU/treestyletab/treestyletab.dtd
index d92bcfda..e3eb13c0 100755
--- a/locale/ru-RU/treestyletab/treestyletab.dtd
+++ b/locale/ru-RU/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "Внешний вид">
 
-<!ENTITY config.tabbar.scroll.smooth "Плавная прокрутка панели вкладок">
+<!ENTITY config.animation.enabled "Использование эффектов анимации">
 
 <!ENTITY config.tabbar.position.caption "Расположение панели вкладок">
 <!ENTITY config.tabbar.position.left    "Слева">
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index 1f1d585b..5a1016c5 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "外观">
 
-<!ENTITY config.tabbar.scroll.smooth "平滑滚动标签栏">
+<!ENTITY config.animation.enabled "使用动画效果">
 
 <!ENTITY config.tabbar.position.caption "标签栏位置">
 <!ENTITY config.tabbar.position.left    "左侧">
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index 69870ece..91bc87ec 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -3,7 +3,7 @@
 
 <!ENTITY config.tabs.appearance "外觀">
 
-<!ENTITY config.tabbar.scroll.smooth "平滑捲動分頁工具列">
+<!ENTITY config.animation.enabled "Enable Animation Effects">
 
 <!ENTITY config.tabbar.position.caption "分頁工具列位置">
 <!ENTITY config.tabbar.position.left    "左側">