diff --git a/docs/notework.txt b/docs/notework.txt
index ca6d46a..78867ac 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,8 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
++ Added @daddr to built-in template for netmail areas.
+
 + Second char from first name will act as lastname in initials
 
 + Improve description of the "DispHdrLocation" config file token.
diff --git a/golded3/getpls.cpp b/golded3/getpls.cpp
index 86062e8..8dc8efd 100644
--- a/golded3/getpls.cpp
+++ b/golded3/getpls.cpp
@@ -226,14 +226,23 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
     if(fp) {
       fputs("@header= @oecho (@caddr) @align{79}{=}\n", fp);
       fputs("@header Msg  : @msgno of @msgs@align{44}@attr\n", fp);
-      if(AA->isinternet()) {
+
+      if (AA->isinternet())
+      {
         fputs("@header From : @ofrom@align{60}@odtime\n", fp);
         fputs("@header To   : @oto\n", fp);
       }
-      else {
+      else if (AA->isnet())
+      {
+        fputs("@header From : @oname@align{44}@oaddr@align{60}@odtime\n", fp);
+        fputs("@header To   : @dname@align{44}@daddr\n", fp);
+      }
+      else
+      {
         fputs("@header From : @oname@align{44}@oaddr@align{60}@odtime\n", fp);
         fputs("@header To   : @dname\n", fp);
       }
+
       fputs("@header Subj : @subject\n", fp);
       fputs("@header@align{79}{=}\n", fp);
       fputs("@moved* Replying to a msg in @oecho (@odesc)\n@moved\n", fp);