diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
index 72981e36..0585fd34 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
@@ -254,7 +254,7 @@ ${page_start}-${page_end}
                                 var message = messages[k].article;
                                 var has_relation = (messages[k].relation !== null) ? true : false;
                                 var date_obj = new Date(Date.parse(message.headers.DATE));
-                                var date = (isToday(date_obj)) ? strftime("%I:%M %p", date_obj) : strftime("%b %d", date_obj)
+                                var date = (isToday(date_obj)) ? strftime("%I:%M %p", date_obj) : strftime("%b %d '%y", date_obj)
                                 data += `
 <table cellspacing=0 cellpadding=0>
 <tr>
@@ -591,11 +591,11 @@ ${strftime("%a, %b %e, %Y, %I:%M%P", new Date(Date.parse(response.article.header
 <td valign=top>
 From:
 <td>`;
-                //              if (message.from_name != message.from_addr) {
-                //                    data += `<a href="client:showalert?sound=none&message=Would%20you%20like%20to%20add%20%3Cblackface%3E${wtvshared.htmlEntitize(message.from_name)}%3C%2Fblackface%3E%20to%20your%20address%20list%3F&buttonlabel2=No&buttonaction2=client:donothing&buttonlabel1=Yes&buttonaction1=wtv-mail:/addressbook%3Faction%3Deditfromheader%26noresponse%3Dtrue%26nickname%3D${escape(escape(message.from_name))}%26address%3D${escape(escape(message.from_addr))}%26new_address%3Dtrue">${wtvshared.htmlEntitize(message.from_addr)} </a>`;
-                //                } else {
+                              if (message.from_name != message.from_addr) {
+                                    data += `<a href="client:showalert?sound=none&message=Would%20you%20like%20to%20add%20%3Cblackface%3E${wtvshared.htmlEntitize(message.from_name)}%3C%2Fblackface%3E%20to%20your%20address%20list%3F&buttonlabel2=No&buttonaction2=client:donothing&buttonlabel1=Yes&buttonaction1=wtv-mail:/addressbook%3Faction%3Deditfromheader%26noresponse%3Dtrue%26nickname%3D${escape(escape(message.from_name))}%26address%3D${escape(escape(message.from_addr))}%26new_address%3Dtrue">${wtvshared.htmlEntitize(message.from_addr)} </a>`;
+                                } else {
                 data += `${wtvshared.htmlEntitize(response.article.headers.FROM)}`;
-                //                }
+                                }
 
                 data += `<tr>
 <td nowrap valign=top>
diff --git a/zefie_wtvp_minisrv/includes/classes/WTVNews.js b/zefie_wtvp_minisrv/includes/classes/WTVNews.js
index e9a41f18..e735d73f 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVNews.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVNews.js
@@ -512,11 +512,11 @@ class WTVNews {
 
             if (message_relations[message_id_roots[k].messageId]) {
                 var relations = [];
-                Object.keys(message_relations[message_id_roots[k].messageId]).forEach((j) => {
+                Object.keys(message_relations[message_roots_sorted[k].article.messageId]).forEach((j) => {
                     // sort relations by date
-                    var article = messages[message_relations[message_id_roots[k].messageId][j].index];
+                    var article = messages[message_relations[message_roots_sorted[k].article.messageId][j].index];
                     var article_date = Date.parse(article.headers.DATE);
-                    relations.push({ "article": article, "relation": message_id_roots[k].messageId || null, "date": article_date })
+                    relations.push({ "article": article, "relation": message_roots_sorted[k].article.messageId || null, "date": article_date })
                 });
                 relations.sort((a, b) => { return (a.date - b.date) });
                 Object.keys(relations).forEach((j) => {