diff -ur sage-local/chrome/content/commonfunc.js sage-local~/chrome/content/commonfunc.js
--- sage-local/chrome/content/commonfunc.js	2006-05-08 22:26:24.000000000 +0900
+++ sage-local~/chrome/content/commonfunc.js	2006-04-15 19:08:38.000000000 +0900
@@ -395,18 +395,12 @@
 			CommonFunc.UNREAD_COUNT_PREFIX + feed.getSignature(),
 			"int",
 			newItemCount);
-
-		var fullTitle = CommonFunc.getBMDSProperty(resource, CommonFunc.BM_NAME);
-
-		if ( CommonFunc.getPrefValue(CommonFunc.SHOW_UNREAD_COUNT, "bool", true) && newItemCount > 0 )
+			
+		var fullTitle = feed.getTitle();
+		if ( CommonFunc.getPrefValue(CommonFunc.SHOW_UNREAD_COUNT, "bool", true) && 
+			 newItemCount > 0 ) 
 	 	{
-			if ( fullTitle.match(/.+\(\d+\)/) ) {	// Strip previous item count
-				fullTitle = fullTitle.substring( 0, fullTitle.lastIndexOf('(') );
-			}
-			if ( fullTitle.charAt(fullTitle.length - 1) != ' ' ) {
-				fullTitle += ' ';
-			}
-			fullTitle += "("+ newItemCount +")";
+			fullTitle += " ("+ newItemCount +")";
 		}
 		
 		CommonFunc.setBMDSProperty(resource, CommonFunc.BM_NAME, fullTitle);
diff -ur sage-local/chrome/content/sage.js sage-local~/chrome/content/sage.js
--- sage-local/chrome/content/sage.js	2006-05-08 22:26:24.000000000 +0900
+++ sage-local~/chrome/content/sage.js	2006-04-15 19:08:38.000000000 +0900
@@ -512,11 +512,10 @@
 			if (CommonFunc.getBMDSProperty(lastResource.res, CommonFunc.BM_NAME) != title) {
 				CommonFunc.setBMDSProperty(lastResource.res, CommonFunc.BM_NAME, title);
 			}
-		
+			
+			CommonFunc.updateUnreadItemCount(aFeed, lastResource.res);
 		}
 
-		CommonFunc.updateUnreadItemCount(aFeed, lastResource.res);
-
 		BMSVC.updateLastVisitedDate(lastResource.url, "UTF-8");
 		CommonFunc.setBMDSProperty(lastResource.res, CommonFunc.BM_DESCRIPTION, CommonFunc.STATUS_NO_UPDATE + " [" + currentFeed.getSignature() + "]");
 	}
diff -ur sage-local/chrome/locale/de-AT/sage.dtd sage-local~/chrome/locale/de-AT/sage.dtd
--- sage-local/chrome/locale/de-AT/sage.dtd	2006-05-08 22:26:24.000000000 +0900
+++ sage-local~/chrome/locale/de-AT/sage.dtd	2006-04-15 19:08:38.000000000 +0900
@@ -19,7 +19,6 @@
 <!ENTITY menu.setting				"Einstellungen">
 <!ENTITY menu.sageProjectFeed				"Sage Projekt Meldungen">
 <!ENTITY menu.discoverFeeds				"Nachrichtenkanäle auf dieser Seite suchen">
-<!ENTITY menu.sidebarLayout				"Sidebar Layout">
 
 <!-- Feed Discovery -->
 <!ENTITY discovery.status.searching     "Aktuelle Seite durchsuchen">
@@ -48,8 +47,6 @@
 <!ENTITY enableUserCss.label			"Benutzerdefiniertes CSS verwenden">
 <!ENTITY browseCss.label			"Durchsuchen...">
 <!ENTITY allowEContent.label			"HTML Tags zulassen">
-<!ENTITY showUnreadCount.label 			"Zeige Anzahl der ungelesenen Nachrichten">
-<!ENTITY settings.timeout.label			"Timeout (in Sekunden)">
 
 
 <!ENTITY openSageSidebar.commandkey		"S">
diff -ur sage-local/chrome/locale/de-CH/sage.dtd sage-local~/chrome/locale/de-CH/sage.dtd
--- sage-local/chrome/locale/de-CH/sage.dtd	2006-05-08 22:26:24.000000000 +0900
+++ sage-local~/chrome/locale/de-CH/sage.dtd	2006-04-15 19:08:38.000000000 +0900
@@ -19,7 +19,6 @@
 <!ENTITY menu.setting				"Einstellungen">
 <!ENTITY menu.sageProjectFeed				"Sage Projekt Meldungen">
 <!ENTITY menu.discoverFeeds				"Nachrichtenkanäle auf dieser Seite suchen">
-<!ENTITY menu.sidebarLayout				"Sidebar Layout">
 
 <!-- Feed Discovery -->
 <!ENTITY discovery.status.searching     "Aktuelle Seite durchsuchen">
@@ -48,8 +47,6 @@
 <!ENTITY enableUserCss.label			"Benutzerdefiniertes CSS verwenden">
 <!ENTITY browseCss.label			"Durchsuchen...">
 <!ENTITY allowEContent.label			"HTML Tags zulassen">
-<!ENTITY showUnreadCount.label 			"Zeige Anzahl der ungelesenen Nachrichten">
-<!ENTITY settings.timeout.label			"Timeout (in Sekunden)">
 
 
 <!ENTITY openSageSidebar.commandkey		"S">
diff -ur sage-local/chrome/locale/de-DE/sage.dtd sage-local~/chrome/locale/de-DE/sage.dtd
--- sage-local/chrome/locale/de-DE/sage.dtd	2006-05-08 22:26:24.000000000 +0900
+++ sage-local~/chrome/locale/de-DE/sage.dtd	2006-04-15 19:08:38.000000000 +0900
@@ -19,7 +19,6 @@
 <!ENTITY menu.setting				"Einstellungen">
 <!ENTITY menu.sageProjectFeed				"Sage Projekt Meldungen">
 <!ENTITY menu.discoverFeeds				"Nachrichtenkanäle auf dieser Seite suchen">
-<!ENTITY menu.sidebarLayout 				"Sidebar Layout">
 
 <!-- Feed Discovery -->
 <!ENTITY discovery.status.searching     "Aktuelle Seite durchsuchen">
@@ -48,8 +47,6 @@
 <!ENTITY enableUserCss.label			"Benutzerdefiniertes CSS verwenden">
 <!ENTITY browseCss.label			"Durchsuchen...">
 <!ENTITY allowEContent.label			"HTML Tags zulassen">
-<!ENTITY showUnreadCount.label 			"Zeige Anzahl der ungelesenen Nachrichten">
-<!ENTITY settings.timeout.label			"Timeout (in Sekunden)">
 
 
 <!ENTITY openSageSidebar.commandkey		"S">
diff -ur sage-local/chrome/locale/es-ES/sage.dtd sage-local~/chrome/locale/es-ES/sage.dtd
--- sage-local/chrome/locale/es-ES/sage.dtd	2006-05-08 22:26:24.000000000 +0900
+++ sage-local~/chrome/locale/es-ES/sage.dtd	2006-04-15 19:08:38.000000000 +0900
@@ -19,7 +19,6 @@
 <!ENTITY menu.setting				"Configuración..">
 <!ENTITY menu.sageProjectFeed				"Noticias Projecto Sage">
 <!ENTITY menu.discoverFeeds				"Descubrir fuentes">
-<!ENTITY menu.sidebarLayout				"Sidebar Layout">
 
 <!-- Feed Discovery -->
 <!ENTITY discovery.status.searching     "Buscando página actual">
@@ -48,8 +47,6 @@
 <!ENTITY enableUserCss.label			"Utilizar CSS personalizada">
 <!ENTITY browseCss.label			"Examinar...">
 <!ENTITY allowEContent.label			"Permitir etiquetas HTML">
-<!ENTITY showUnreadCount.label		"Mostrar contador de fuentes no leídas">
-<!ENTITY settings.timeout.label		"Tiempo de expiración (segundos)">
 
 
 <!ENTITY openSageSidebar.commandkey		"S">
diff -ur sage-local/chrome/locale/fr-FR/sage.dtd sage-local~/chrome/locale/fr-FR/sage.dtd
--- sage-local/chrome/locale/fr-FR/sage.dtd	2006-05-08 22:26:24.000000000 +0900
+++ sage-local~/chrome/locale/fr-FR/sage.dtd	2006-04-15 19:08:38.000000000 +0900
@@ -19,7 +19,6 @@
 <!ENTITY menu.setting							 "Configuration...">
 <!ENTITY menu.sageProjectFeed					 "Nouveautés du projet Sage">
 <!ENTITY menu.discoverFeeds						 "Découvrir de nouveaux fils">
-<!ENTITY menu.sidebarLayout						 "Sidebar Layout">
 
 <!-- Feed Discovery -->
 <!ENTITY discovery.status.searching     		 "Chercher dans la page en cours">
@@ -49,7 +48,6 @@
 <!ENTITY browseCss.label						 "Parcourir...">
 <!ENTITY allowEContent.label					 "Autoriser les balises HTML">
 <!ENTITY showUnreadCount.label					 "Afficher le nombre de messages a lire">
-<!ENTITY settings.timeout.label					 "Temps d'expiration (secondes)">
 
 <!ENTITY openSageSidebar.commandkey				 "S">
 <!ENTITY openSageSidebar.modifiersKey			 "alt">
diff -ur sage-local/chrome/locale/ja-JP/sage.dtd sage-local~/chrome/locale/ja-JP/sage.dtd
--- sage-local/chrome/locale/ja-JP/sage.dtd	2006-05-10 13:47:21.989581551 +0900
+++ sage-local~/chrome/locale/ja-JP/sage.dtd	2006-04-15 19:08:38.000000000 +0900
@@ -19,7 +19,6 @@
 <!ENTITY menu.setting				"設定...">
 <!ENTITY menu.sageProjectFeed				"Sageプロジェクトニュース">
 <!ENTITY menu.discoverFeeds				"フィードを発見する">
-<!ENTITY menu.sidebarLayout				"サイドバーの配置">
 
 <!-- Feed Discovery -->
 <!ENTITY discovery.status.searching     "現在のページを検索">
@@ -48,8 +47,6 @@
 <!ENTITY enableUserCss.label		"ユーザースタイルシートを使う">
 <!ENTITY browseCss.label			"参照...">
 <!ENTITY allowEContent.label		"HTML タグを許可する">
-<!ENTITY showUnreadCount.label 	"未読数の表示">
-<!ENTITY settings.timeout.label	"タイムアウト秒">
 
 
 <!ENTITY openSageSidebar.commandkey	"S">