diff --git a/docs/notework.txt b/docs/notework.txt
index 8744f12..75d6e82 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,8 +12,10 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- Fixed pseudo in Internet areas.
+
 - Partially fixed ATTRIBSEMAIL and ATTRIBSNEWS operation. They still
-  not affected to the areas defined as such through the AREAISEMAIL
+  not affected the areas defined as such through the AREAISEMAIL
   and AREAISNEWS and if no ATTRIBUTES defined in the Random System
   group. It seems will never been fixed but will rather documented as
   a feature.
diff --git a/golded3/geusrbse.cpp b/golded3/geusrbse.cpp
index b9d7b26..314969e 100644
--- a/golded3/geusrbse.cpp
+++ b/golded3/geusrbse.cpp
@@ -908,8 +908,12 @@ bool guserbase::lookup_addressbook(GMsg* msg, char* name, char* aka, bool browse
 
 void guserbase::build_pseudo(GMsg* msg, char* name, char* aka, bool direction) {
 
-  if(*msg->iaddr and isuucp(name))
-    strcpy(direction ? msg->pseudoto : msg->pseudofrom, strlword(msg->iaddr, " @."));
+  if(*msg->iaddr and isuucp(name)) {
+    if(direction)
+      strcpy(msg->pseudoto, strlword(msg->iaddr, " @."));
+    else
+      strcpy(msg->pseudofrom, strlword(msg->iorig, " @."));
+  }
   else
     strcpy(direction ? msg->pseudoto : msg->pseudofrom, strlword(name, " @."));
 
@@ -965,9 +969,9 @@ void build_pseudo(GMsg* msg, bool direction) {
   char buf[128];
 
   if(direction)
-    p.build_pseudo(msg, strbtrim(msg->To()), msg->dest.make_string(buf));
+    p.build_pseudo(msg, strbtrim(msg->To()), AA->isinternet() ? msg->iaddr : msg->dest.make_string(buf));
   else
-    p.build_pseudo(msg, strbtrim(msg->By()), msg->orig.make_string(buf), false);
+    p.build_pseudo(msg, strbtrim(msg->By()), AA->isinternet() ? msg->iorig : msg->orig.make_string(buf), false);
 }