From 78255de531a12ee412510913cfdb66777a7560ed Mon Sep 17 00:00:00 2001
From: Ianos Gnatiuc <ssianky@users.sourceforge.net>
Date: Sat, 31 Dec 2005 10:40:53 +0000
Subject: [PATCH] Placed AKAMatchManually after all aka matching logic

---
 docs/notework.txt  |  2 ++
 golded3/gehdre.cpp | 13 +++++++++++--
 golded3/gepost.cpp |  5 -----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/docs/notework.txt b/docs/notework.txt
index 839abc8..2b3de5a 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,8 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- Placed AKAMatchManually after all aka matching logic.
+
 - Fixed buffer overun for too wide menus.
 
 + Added new config file token: XlatCharSetAlias "charset" "alias1" "alias2"...
diff --git a/golded3/gehdre.cpp b/golded3/gehdre.cpp
index ce62aae..3eb9a85 100644
--- a/golded3/gehdre.cpp
+++ b/golded3/gehdre.cpp
@@ -607,11 +607,20 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view, bool doedithdr) {
           if(AA->Aka().addr.equals(AA->aka())) {
 
             // Do aka matching
-            if(AA->Akamatching()) {
-              strcpy(msg->odom, CFG->aka[AkaMatch(&msg->orig, &msg->dest)].domain);
+            if(AA->Akamatching())
+            {
+              AkaMatch(&msg->orig, &msg->dest);
+              AA->SetAka(msg->orig);
             }
           }
         }
+
+        if (AA->Akamatching())
+        {
+          if (CFG->akamatchmanually) ChangeAka();
+          msg->orig = AA->Aka().addr;
+          strcpy(msg->odom, AA->Aka().domain);
+        }
       }
     }
   }
diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp
index 0e9f7b9..bc224a0 100644
--- a/golded3/gepost.cpp
+++ b/golded3/gepost.cpp
@@ -907,8 +907,6 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
               AkaMatch(&aka_addr, &omsg->orig);
               AA->SetAka(aka_addr);
             }
-
-            if (CFG->akamatchmanually) ChangeAka();
           }
 
           if((mode == MODE_REPLYCOMMENT) and not omsg->fwdorig.net) {
@@ -1049,9 +1047,6 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
             strcpy(msg->to, "");
             msg->dest.reset_fast();
             msg->odest.reset_fast();
-
-            if (AA->Akamatching() && CFG->akamatchmanually)
-              ChangeAka();
           }
           if(not AA->isnet() or (AA->isemail() and strchr(AA->Whoto(), '@')))
             strcpy(msg->to, AA->Whoto());