diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp
index 44b4c82..73a2d53 100644
--- a/golded3/gepost.cpp
+++ b/golded3/gepost.cpp
@@ -313,9 +313,9 @@ static void MakeMsg3(int& mode, GMsg* msg) {
     w_info(NULL);
   }
 
-  if(AL.AreaEchoToNo(AA->Areayouwroteto())>=0) {
+  if((mode != MODE_CHANGE) && (AL.AreaEchoToNo(AA->Areayouwroteto())>=0)) {
     Area* A = AL.AreaEchoToPtr(AA->Areayouwroteto());
-    if(AA != A and (mode != MODE_CHANGE)) {
+    if(AA != A) {
       char* back = NULL;
       uint mlen = 0;