-#: src/addressbook.c:915 src/addressbook.c:2088 src/compose.c:2695
-#: src/compose.c:6096 src/exphtmldlg.c:158 src/inc.c:173 src/inc.c:278
-#: src/mainwindow.c:1294 src/mainwindow.c:2220 src/message_search.c:198
-#: src/prefs_actions.c:877 src/prefs_customheader.c:541 src/prefs_filter.c:813
-#: src/prefs_filtering.c:966 src/prefs_scoring.c:632 src/prefs_template.c:514
-#: src/summary_search.c:311 src/summaryview.c:710 src/summaryview.c:1087
-#: src/summaryview.c:1131 src/summaryview.c:1174 src/summaryview.c:1198
-#: src/summaryview.c:1230 src/summaryview.c:1255 src/summaryview.c:1280
-#: src/summaryview.c:1305 src/summaryview.c:2776
+#: src/addressbook.c:915 src/addressbook.c:2088 src/compose.c:2710
+#: src/compose.c:6112 src/exphtmldlg.c:158 src/folderview.c:799 src/inc.c:172
+#: src/inc.c:277 src/mainwindow.c:1303 src/mainwindow.c:2254
+#: src/message_search.c:198 src/prefs_actions.c:877
+#: src/prefs_customheader.c:541 src/prefs_filter.c:813
+#: src/prefs_filtering.c:979 src/prefs_scoring.c:632 src/prefs_template.c:514
+#: src/summary_search.c:311 src/summaryview.c:801 src/summaryview.c:1215
+#: src/summaryview.c:1259 src/summaryview.c:1302 src/summaryview.c:1326
+#: src/summaryview.c:1358 src/summaryview.c:1383 src/summaryview.c:1408
+#: src/summaryview.c:1433 src/summaryview.c:2916