diff --git a/src/tpl/action-bar.html b/src/tpl/action-bar.html
index 9091a2e..e81bbab 100644
--- a/src/tpl/action-bar.html
+++ b/src/tpl/action-bar.html
@@ -29,7 +29,8 @@
     <li ng-repeat="folder in account.folders">
       <button wo-touch="state.read.open ? moveMessage(state.mailList.selected, folder) : moveCheckedMessages(folder)">
         <svg><use xlink:href="#icon-folder" /></svg>
-        {{folder.wellknown ? folder.type : folder.name}}
+        <span ng-show="folder.wellknown">{{folder.type === 'Flagged' ? 'Starred' : folder.type}}</span>
+        <span ng-show="!folder.wellknown">{{folder.name}}</span>
       </button>
     </li>
   </ul><!--/dropdown-->
diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html
index 64016e1..ce45b58 100644
--- a/src/tpl/mail-list.html
+++ b/src/tpl/mail-list.html
@@ -5,7 +5,8 @@
       <button class="btn-navicon">
         <svg><use xlink:href="#icon-navicon" /><title>Toggle Navigation</title></svg>
       </button>
-      <h2>{{state.nav.currentFolder.wellknown ? state.nav.currentFolder.type : state.nav.currentFolder.name}}</h2>
+      <h2 ng-show="state.nav.currentFolder.wellknown">{{state.nav.currentFolder.type === 'Flagged' ? 'Starred' : state.nav.currentFolder.type}}</h2>
+      <h2 ng-show="!state.nav.currentFolder.wellknown">{{state.nav.currentFolder.name}}</h2>
     </div>
 
     <button class="btn-icon-light" title="New mail" wo-touch="state.writer.write(); $event.stopPropagation()">
diff --git a/src/tpl/read.html b/src/tpl/read.html
index 2b84c20..92b8c62 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -8,7 +8,8 @@
     <div class="toolbar">
       <a class="toolbar__label" href="javascript:;" wo-touch="state.read.toggle(false)">
         <svg><use xlink:href="#icon-back" /><title>Back</title></svg>
-        {{state.nav.currentFolder.wellknown ? state.nav.currentFolder.type : state.nav.currentFolder.name}}
+        <span ng-show="state.nav.currentFolder.wellknown">{{state.nav.currentFolder.type === 'Flagged' ? 'Starred' : state.nav.currentFolder.type}}</span>
+        <span ng-show="!state.nav.currentFolder.wellknown">{{state.nav.currentFolder.name}}</span>
       </a>
     </div>
   </div><!--/read__folder-toolbar-->
@@ -174,7 +175,8 @@
     <li ng-repeat="folder in account.folders">
       <button wo-touch="moveMessage(state.mailList.selected, folder)">
         <svg><use xlink:href="#icon-folder" /></svg>
-        {{folder.wellknown ? folder.type : folder.name}}
+        <span ng-show="folder.wellknown">{{folder.type === 'Flagged' ? 'Starred' : folder.type}}</span>
+        <span ng-show="!folder.wellknown">{{folder.name}}</span>
       </button>
     </li>
   </ul><!--/dropdown-->