diff --git a/docs/notework.txt b/docs/notework.txt
index de8fd7d..361a332 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,6 +12,8 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- Fixed "EditChangeDate Always" operation.
+
 ! AREALISTSORT letters a bit changed in the way they processed:
   P - sort by personal mail count, not by the presence
   Y - sort by changing from last scan (the same criteria as used for
diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp
index 0b5b0f4..20875af 100644
--- a/golded3/gepost.cpp
+++ b/golded3/gepost.cpp
@@ -811,8 +811,8 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
       // Set msg date and time
       bool dochgdate = true;
       if(mode == MODE_CHANGE) {
-        dochgdate = EDIT->ChangeDate();
-        if(dochgdate and not msg->attr.fmu())
+        dochgdate = EDIT->ChangeDate() ? true : false;
+        if((EDIT->ChangeDate() == YES) and not msg->attr.fmu())
           dochgdate = false;
       }
       if(dochgdate) {