diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp
index 3465d8d..7dcb9cf 100644
--- a/golded3/gepost.cpp
+++ b/golded3/gepost.cpp
@@ -601,7 +601,7 @@ static void MakeMsg2(int& mode, int& status, int& forwstat, int& topline, GMsg*
             else
               line->type = 0;
             strtrimline(line->txt);
-            if(AA->isinternet()) {
+            if(AA->isinternet() or *msg->ito or *msg->ifrom) {
               // Check for signature indicator
               if(streql(line->txt.c_str(), "--")) {
                 line->txt = "-- ";