diff --git a/include/relapp.cpp b/include/relapp.cpp
index d37b8127c..0424aee52 100755
--- a/include/relapp.cpp
+++ b/include/relapp.cpp
@@ -1,4 +1,4 @@
-//      $Id: relapp.cpp,v 1.60 1995-06-23 14:51:14 guy Exp $        
+//      $Id: relapp.cpp,v 1.61 1995-06-26 16:51:48 alex Exp $        
 #include <mailbox.h>
 #include <sheet.h>
 #include <urldefid.h>
@@ -602,9 +602,13 @@ bool TRelation_application::save(bool check_dirty)
     if (errore)
     {
       if (annulla) 
-      {
-        k = yesno_box("Campo inconsistente: annullare?") ? K_NO : K_ESC;
-        if (k == K_ESC) _mask->first_focus(-_mask->field(dirty).dlg());
+      { 
+        TString w(_mask->field(dirty).warning());
+        
+        if (w.empty()) 
+          w = "Campo inconsistente";
+        k = yesno_box("%s: annullare?", (const char *) w) ? K_ESC : K_NO;
+        if (k == K_NO) _mask->first_focus(-_mask->field(dirty).dlg());
       }  
       else k = K_ESC;
     }
@@ -619,7 +623,7 @@ bool TRelation_application::save(bool check_dirty)
         get_relation()->lfile().reread(_unlock);     // Unlock main file
       }  
       was_dirty = FALSE;
-      return TRUE;
+      return k == K_ESC;
     }        
 
     if (annulla)