diff --git a/locale/translations.go b/locale/translations.go
index 5ff72a37..ac9229c7 100644
--- a/locale/translations.go
+++ b/locale/translations.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-24 14:32:38.883179987 -0800 PST m=+0.040204882
+// 2017-12-26 20:56:49.146246015 -0800 PST m=+0.048892271
 
 package locale
 
@@ -145,7 +145,7 @@ var translations = map[string]string{
     "Drag and drop this link to your bookmarks.": "Glisser-déposer ce lien dans vos favoris.",
     "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Ce lien spécial vous permet de vous abonner à un site web directement en utilisant un marque page dans votre navigateur web.",
     "Add to Miniflux": "Ajouter à Miniflux",
-    "Refresh all feeds in the background": "Actualiser les abonnements en arrière-plan",
+    "Refresh all feeds in background": "Actualiser les abonnements en arrière-plan",
     "Sign in with Google": "Se connecter avec Google",
     "Unlink my Google account": "Dissocier mon compte Google",
     "Link my Google account": "Associer mon compte Google",
@@ -183,12 +183,16 @@ var translations = map[string]string{
     "Star": "Favoris",
     "Unstar": "Enlever favoris",
     "Starred": "Favoris",
-    "There is no bookmark at the moment.": "Il n'y a aucun favoris pour le moment."
+    "There is no bookmark at the moment.": "Il n'y a aucun favoris pour le moment.",
+    "Last checked:": "Dernière vérification :",
+    "ETag header:": "En-tête ETag :",
+    "LastModified header:": "En-tête LastModified :",
+    "None": "Aucun/Aucune"
 }
 `,
 }
 
 var translationsChecksums = map[string]string{
 	"en_US": "6fe95384260941e8a5a3c695a655a932e0a8a6a572c1e45cb2b1ae8baa01b897",
-	"fr_FR": "e6817ae43e1412d2687036fb4c1b9f6ea4a2329dcb1eddfa01ebbad732c7b401",
+	"fr_FR": "59edb9fa27828c14c3ca462d09da30d876c92c0decd7d597c1a266956f2b72e6",
 }
diff --git a/locale/translations/fr_FR.json b/locale/translations/fr_FR.json
index 7d7aca93..77bba7d5 100644
--- a/locale/translations/fr_FR.json
+++ b/locale/translations/fr_FR.json
@@ -129,7 +129,7 @@
     "Drag and drop this link to your bookmarks.": "Glisser-déposer ce lien dans vos favoris.",
     "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Ce lien spécial vous permet de vous abonner à un site web directement en utilisant un marque page dans votre navigateur web.",
     "Add to Miniflux": "Ajouter à Miniflux",
-    "Refresh all feeds in the background": "Actualiser les abonnements en arrière-plan",
+    "Refresh all feeds in background": "Actualiser les abonnements en arrière-plan",
     "Sign in with Google": "Se connecter avec Google",
     "Unlink my Google account": "Dissocier mon compte Google",
     "Link my Google account": "Associer mon compte Google",
@@ -167,5 +167,9 @@
     "Star": "Favoris",
     "Unstar": "Enlever favoris",
     "Starred": "Favoris",
-    "There is no bookmark at the moment.": "Il n'y a aucun favoris pour le moment."
+    "There is no bookmark at the moment.": "Il n'y a aucun favoris pour le moment.",
+    "Last checked:": "Dernière vérification :",
+    "ETag header:": "En-tête ETag :",
+    "LastModified header:": "En-tête LastModified :",
+    "None": "Aucun/Aucune"
 }
diff --git a/server/template/html/edit_feed.html b/server/template/html/edit_feed.html
index 15670c60..7a5822e8 100644
--- a/server/template/html/edit_feed.html
+++ b/server/template/html/edit_feed.html
@@ -64,6 +64,14 @@
             <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Update" }}</button> {{ t "or" }} <a href="{{ route "feeds" }}">{{ t "cancel" }}</a>
         </div>
     </form>
+
+    <div class="panel">
+        <ul>
+            <li><strong>{{ t "Last checked:"}} </strong>{{ isodate .feed.CheckedAt }}</li>
+            <li><strong>{{ t "ETag header:"}} </strong>{{ if .feed.EtagHeader }}{{ .feed.EtagHeader }}{{ else }}{{ t "None" }}{{ end }}</li>
+            <li><strong>{{ t "LastModified header:"}} </strong>{{ if .feed.LastModifiedHeader }}{{ .feed.LastModifiedHeader }}{{ else }}{{ t "None" }}{{ end }}</li>
+        </ul>
+    </div>
 {{ end }}
 
 {{ end }}
\ No newline at end of file
diff --git a/server/template/html/feeds.html b/server/template/html/feeds.html
index c5c39e82..5500c92f 100644
--- a/server/template/html/feeds.html
+++ b/server/template/html/feeds.html
@@ -14,7 +14,7 @@
             <a href="{{ route "import" }}">{{ t "Import" }}</a>
         </li>
         <li>
-            <a href="{{ route "refreshAllFeeds" }}">{{ t "Refresh all feeds in the background" }}</a>
+            <a href="{{ route "refreshAllFeeds" }}">{{ t "Refresh all feeds in background" }}</a>
         </li>
     </ul>
 </section>
diff --git a/server/template/views.go b/server/template/views.go
index 2f47d993..98c2084f 100644
--- a/server/template/views.go
+++ b/server/template/views.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-26 20:38:06.293140899 -0800 PST m=+0.021474553
+// 2017-12-26 20:56:49.130032651 -0800 PST m=+0.032678907
 
 package template
 
@@ -429,6 +429,14 @@ var templateViewsMap = map[string]string{
             <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Update" }}</button> {{ t "or" }} <a href="{{ route "feeds" }}">{{ t "cancel" }}</a>
         </div>
     </form>
+
+    <div class="panel">
+        <ul>
+            <li><strong>{{ t "Last checked:"}} </strong>{{ isodate .feed.CheckedAt }}</li>
+            <li><strong>{{ t "ETag header:"}} </strong>{{ if .feed.EtagHeader }}{{ .feed.EtagHeader }}{{ else }}{{ t "None" }}{{ end }}</li>
+            <li><strong>{{ t "LastModified header:"}} </strong>{{ if .feed.LastModifiedHeader }}{{ .feed.LastModifiedHeader }}{{ else }}{{ t "None" }}{{ end }}</li>
+        </ul>
+    </div>
 {{ end }}
 
 {{ end }}`,
@@ -686,7 +694,7 @@ var templateViewsMap = map[string]string{
             <a href="{{ route "import" }}">{{ t "Import" }}</a>
         </li>
         <li>
-            <a href="{{ route "refreshAllFeeds" }}">{{ t "Refresh all feeds in the background" }}</a>
+            <a href="{{ route "refreshAllFeeds" }}">{{ t "Refresh all feeds in background" }}</a>
         </li>
     </ul>
 </section>
@@ -1331,11 +1339,11 @@ var templateViewsMapChecksums = map[string]string{
 	"create_category":     "2b82af5d2dcd67898dc5daa57a6461e6ff8121a6089b2a2a1be909f35e4a2275",
 	"create_user":         "45e226df757126d5fe7c464e295e9a34f07952cfdb71e31e49839850d35af139",
 	"edit_category":       "cee720faadcec58289b707ad30af623d2ee66c1ce23a732965463250d7ff41c5",
-	"edit_feed":           "7e78f0821312557ca05eb840fd52bcb60509c6da205e8ffce11eb08f65ae143d",
+	"edit_feed":           "7faf55bc4070b5238f3a41dfcddc19650d8201deb1001a93b1b843a2674fac32",
 	"edit_user":           "82d9749d76ddbd2352816d813c4b1f6d92f2222de678b4afe5821090246735c7",
 	"entry":               "6b4405e0c8e4a7d31874659f8835f4e43e01dc3c20686091517ac750196dd70f",
 	"feed_entries":        "ac93cb9a90f93ddd9dd8a67d7e160592ecb9f5e465ee9679bb14eecd8d4caf20",
-	"feeds":               "2a3951bfbb08e9f825ab4a018344e8ef8461a09efaf86ac9da3c99d6f3b2a2de",
+	"feeds":               "65b0a47c4438810b9d51c60f3f3b2519690e56ff74029e6296c68626b83a470b",
 	"history":             "abc7ea29f7d54f28f73fe14979bbd03dbc41fa6a7c86f95f56d6e94f7b09b9ba",
 	"import":              "73b5112e20bfd232bf73334544186ea419505936bc237d481517a8622901878f",
 	"integrations":        "3c14d7de904911aad7f3ebec6d1a20b50843287f58125c526e167f429f3d455d",