diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index 438f2039d..f194402a8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -169,6 +169,9 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
         }
     }
 
+    /* (non-Javadoc)
+     * @see com.todoroo.astrid.activity.TaskListActivity#getListBody(android.view.ViewGroup)
+     */
     @SuppressWarnings("nls")
     @Override
     protected View getListBody(ViewGroup root) {
@@ -181,6 +184,7 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
         tabHost.setup();
 
         taskListView = super.getListBody(parent);
+        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
         tabContent.addView(taskListView);
 
         addTab(taskListView.getId(), "tasks", tabLabels[0]);
@@ -486,6 +490,8 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
         tagMembers.addPerson(""); //$NON-NLS-1$
     }
 
+    // --------------------------------------------------------- refresh data
+
     /** refresh the list with latest data from the web */
     private void refreshData(final boolean manual, boolean bypassTagShow) {
         final boolean noRemoteId = tagData.getValue(TagData.REMOTE_ID) == 0;
@@ -539,6 +545,7 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
                     @Override
                     public void run() {
                         loadTaskListContent(true);
+                        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
                         DialogUtilities.dismissDialog(TagViewActivity.this, progressDialog);
                     }
                 });
diff --git a/astrid/res/layout/edit_note_activity.xml b/astrid/res/layout/edit_note_activity.xml
index 8d378bb1d..379d51cec 100644
--- a/astrid/res/layout/edit_note_activity.xml
+++ b/astrid/res/layout/edit_note_activity.xml
@@ -18,7 +18,7 @@
             android:layout_weight="100"
             android:gravity="center"
             android:visibility="gone"
-            android:text="@string/ENA_loading"
+            android:text="@string/DLG_loading"
             android:textSize="20sp" />
         
         <ListView
diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index a67ac286d..70d3d5d35 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -381,7 +381,7 @@ File %1$s contained %2$s.\n\n
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Carregant...</string>
+  <string name="DLG_loading">Carregant...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 26b5a5513..e8a884e83 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Nahrávám...</string>
+  <string name="DLG_loading">Nahrávám...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index 57f4b7c4d..5832337b8 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Indlæser...</string>
+  <string name="DLG_loading">Indlæser...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 6b1e8cd4c..4911d1634 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Lade...</string>
+  <string name="DLG_loading">Lade...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index ef3475f45..65f25647b 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -381,7 +381,7 @@ File %1$s contained %2$s.\n\n
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Cargando...</string>
+  <string name="DLG_loading">Cargando...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 65e1bf1dd..c95562d05 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -375,7 +375,7 @@
   <string name="ENA_no_comments">Rien à afficher</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Chargement…</string>
+  <string name="DLG_loading">Chargement…</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Mettre à jour les commentaires</string>
diff --git a/astrid/res/values-he/strings.xml b/astrid/res/values-he/strings.xml
index 1509f8238..5b39db7c1 100644
--- a/astrid/res/values-he/strings.xml
+++ b/astrid/res/values-he/strings.xml
@@ -383,7 +383,7 @@ File %1$s contained %2$s.\n\n
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">בטעינה...</string>
+  <string name="DLG_loading">בטעינה...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 88f8bf228..7c1e437b1 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Caricamento...</string>
+  <string name="DLG_loading">Caricamento...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 1f387f2dc..88c465587 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -378,7 +378,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">読み込み中...</string>
+  <string name="DLG_loading">読み込み中...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index b31d11b33..fd105c4b5 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">로딩중...</string>
+  <string name="DLG_loading">로딩중...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index 8e0569c31..9a6e0233c 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Laster ...</string>
+  <string name="DLG_loading">Laster ...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 0d5946b6b..2b68bc37f 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -375,7 +375,7 @@
   <string name="ENA_no_comments">Niets om weer te geven</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Laden…</string>
+  <string name="DLG_loading">Laden…</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Opmerkingen vernieuwen</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index dc2516e14..102a8124b 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Ładowanie...</string>
+  <string name="DLG_loading">Ładowanie...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index b1d2943c0..40c39ae48 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Carregando...</string>
+  <string name="DLG_loading">Carregando...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-ru/strings-opencrx.xml b/astrid/res/values-ru/strings-opencrx.xml
index e0378dfba..65ad0fa3c 100644
--- a/astrid/res/values-ru/strings-opencrx.xml
+++ b/astrid/res/values-ru/strings-opencrx.xml
@@ -139,4 +139,4 @@
     <string name="CFC_opencrx_assigned_to_name">Присвоено ...</string>
 
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index ccb11bf3b..bb8058c80 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Загрузка…</string>
+  <string name="DLG_loading">Загрузка…</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 48d0c16d0..ef87c05d9 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Laddar...</string>
+  <string name="DLG_loading">Laddar...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index 8a508d0e6..46d100ac5 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -383,7 +383,7 @@ File %1$s contained %2$s.\n\n
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">กำลังโหลด...</string>
+  <string name="DLG_loading">กำลังโหลด...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index bbc8f36a0..3b0297f94 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -375,7 +375,7 @@
   <string name="ENA_no_comments">没有要显示的</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">载入中...</string>
+  <string name="DLG_loading">载入中...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">刷新留言</string>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 877ecbb37..b7e74dad6 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -376,7 +376,7 @@
   <string name="ENA_no_comments">Nothing To Show</string>
   
   <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">載入中...</string>
+  <string name="DLG_loading">載入中...</string>
   
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index a056a45fd..e9dbd5f49 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -53,6 +53,9 @@
   <!-- Progress Dialog generic text -->
   <string name="DLG_please_wait">Please Wait</string>
   
+  <!-- Dialog - loading -->
+  <string name="DLG_loading">Loading...</string>
+  
   <!-- =============================================================== UI == -->
   
   <!-- Label for DateButtons with no value -->
@@ -80,9 +83,6 @@
   <!-- EditNoteActivity - no comments -->
   <string name="ENA_no_comments">Nothing To Show</string>
   
-  <!-- EditNoteActivity - loading -->
-  <string name="ENA_loading">Loading...</string>
-  
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>