Index: mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-view.vm
===================================================================
--- mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-view.vm	(revision 110026)
+++ mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-view.vm	(working copy)
@@ -90,11 +90,11 @@
 					<input type="button" value="&lt; $tlang.getString('view.prev')" disabled="disabled" />		
 			#end
 			<a href="#" title="$tlang.getString('view.return')" onclick="location = '#toolLink("$action" "doList")';return false;">
-				<input type="button" value="$tlang.getString('view.return')" title="Return to List" />	
+				<input type="button" value="$tlang.getString('view.return')" title="$tlang.getString('view.return')" />	
 			</a>
 			#if ($goNPButton)
 				<a href="#" title="$tlang.getString('view.next')" onclick="location = '#toolLinkParam("$action" "doView" "item_number=${nextPos}")';return false;">
-					<input type="button" value="$tlang.getString('view.next') &gt;" title="Go to Next Email" />
+					<input type="button" value="$tlang.getString('view.next') &gt;" title="$tlang.getString('view.next')" />
 				</a>
 			#end
 		</div>
Index: mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-List.vm
===================================================================
--- mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-List.vm	(revision 110026)
+++ mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-List.vm	(working copy)
@@ -38,7 +38,7 @@
 				<input type="hidden" name="eventSubmit_doSearch" id="eventSubmit_doSearch" value="Search for emails" />
 				<a href="#" title="$tlang.getString('lis.search')" onclick="location = '#toolLink("$action" "doSearch")'+buildQueryString('toolbar');document.getElementById('submitnotifwrap').style.visibility='visible';return false;" style="text-decoration:none !important"><input type="button" value="$tlang.getString('lis.search')" /></a>
 				#if (($!search) && (!$search.equals("")))
-					<a href="#" title="Search" onclick="location = '#toolLink("$action" "doSearch_clear")';return false;" style="text-decoration:none !important"><input type="button" value="$tlang.getString('lis.clear')" /></a>
+					<a href="#" title="$tlang.getString('lis.clear')" onclick="location = '#toolLink("$action" "doSearch_clear")';return false;" style="text-decoration:none !important"><input type="button" value="$tlang.getString('lis.clear')" /></a>
 				#end
 				<div id="submitnotifwrap" style="padding:6px 0;visibility:hidden"><span id="submitnotif">$tlang.getString("lis.searchnotif")</span></div>								
 			</div>