Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -N -r1.28.2.4 -r1.28.2.5
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	25 Mar 2019 14:16:36 -0000	1.28.2.4
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	8 Apr 2019 13:24:37 -0000	1.28.2.5
@@ -353,6 +353,18 @@
                     -package_key $package_key \
                     -message_key $message_key \
                     -locale $locale
+                # Test undelete after deleting for the first time
+                aa_log "Undeleting message $message_key"
+                lang::message::undelete \
+                    -package_key $package_key \
+                    -message_key $message_key \
+                    -locale $locale
+                # Delete the message again
+                aa_log "Deleting message $message_key definitively"
+                lang::message::delete \
+                    -package_key $package_key \
+                    -message_key $message_key \
+                    -locale $locale
             }
         } else {
             # Message is supposed to exist in DB
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	17 Jul 2018 18:30:29 -0000	1.18
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	8 Apr 2019 13:24:37 -0000	1.18.2.1
@@ -67,7 +67,7 @@
               </td>
               <td>@messages.default_message@</td>
               <if @default_locale@ ne @current_locale@>
-                <td>                  
+                <td>
                   <if @messages.deleted_p;literal@ true>
                     <span style="color: red; font-style: italic;">DELETED</span> (@messages.translated_message@)
                   </if>
@@ -79,7 +79,12 @@
               </if>
               <if @messages.translated_message@ not nil>
                 <td>
-                  <a href="@messages.delete_url@" title="Delete this messages"><img src="/shared/images/Delete16.gif" alt="delete" width="16" height="16"></a>
+                  <if @messages.deleted_p;literal@ true>
+                    <a href="@messages.undelete_url@" title="Undelete this message"><img src="/shared/images/Undelete16.gif" alt="delete" width="16" height="16"></a>
+                  </if>
+                  <else>
+                    <a href="@messages.delete_url@" title="Delete this message"><img src="/shared/images/Delete16.gif" alt="delete" width="16" height="16"></a>
+                  </else>
                 </td>
              </if>
             </tr>
Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -N -r1.19 -r1.19.2.1
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	28 May 2018 13:36:18 -0000	1.19
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	8 Apr 2019 13:24:37 -0000	1.19.2.1
@@ -109,13 +109,15 @@
     set where_clause "and [join $where_clauses "\n and "]"
 }
 
-db_multirow -extend { 
+db_multirow -extend {
     edit_url
     delete_url
+    undelete_url
     message_key_pretty
 } messages select_messages {} {
-    set edit_url [export_vars -base edit-localized-message { locale package_key message_key show {return_url [ad_return_url]} }]
-    set delete_url [export_vars -base message-delete { locale package_key message_key show {return_url [ad_return_url]} }]
+    set edit_url        [export_vars -base edit-localized-message { locale package_key message_key show {return_url [ad_return_url]} }]
+    set undelete_url    [export_vars -base message-undelete { locale package_key message_key show {return_url [ad_return_url]} }]
+    set delete_url      [export_vars -base message-delete { locale package_key message_key show {return_url [ad_return_url]} }]
     set message_key_pretty "$package_key.$message_key"
 }
 
Index: openacs-4/packages/acs-lang/www/admin/message-undelete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-undelete.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/message-undelete.adp	8 Apr 2019 13:24:37 -0000	1.1.2.1
@@ -0,0 +1,14 @@
+<master>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
+
+<p />
+
+<p>
+  Undeleting message for key <strong>@package_key@.@message_key@</strong> in locale @locale@.
+</p>
+
+<form action="message-undelete">
+@form_export_vars;noquote@
+<input type="submit" value="Confirm undelete">
+</form>
Index: openacs-4/packages/acs-lang/www/admin/message-undelete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-undelete.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/message-undelete.tcl	8 Apr 2019 13:24:37 -0000	1.1.2.1
@@ -0,0 +1,50 @@
+ad_page_contract {
+
+    Undelete a message
+
+    @author Héctor Romojaro <hector.romojaro@gmail.com>
+
+    @creation-date 2019-04-08
+    @cvs-id $Id $
+
+} {
+    locale
+    package_key
+    message_key
+    show:optional
+    confirm_p:boolean,optional
+}
+
+
+# We rename to avoid conflict in queries
+set current_locale $locale
+set default_locale en_US
+
+set locale_label [lang::util::get_label $current_locale]
+set default_locale_label [lang::util::get_label $default_locale]
+
+set page_title "Undelete Message"
+set context [list [list [export_vars -base package-list { locale }] $locale_label] \
+                 [list [export_vars -base message-list { locale package_key show }] $package_key] \
+                 $page_title]
+
+set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} }]
+
+
+if { [info exists confirm_p] && $confirm_p ne ""
+     && [template::util::is_true $confirm_p]
+ } {
+    lang::message::undelete \
+        -package_key $package_key \
+        -message_key $message_key \
+        -locale $locale
+
+    ad_returnredirect [export_vars -base message-list { locale package_key show }]
+    ad_script_abort
+}
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/acs-subsite/www/shared/images/Undelete16.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/images/Attic/Undelete16.gif,v
diff -u -N -r1.1 -r1.1.2.1
Binary files differ
Index: openacs-4/packages/acs-subsite/www/shared/images/Undelete24.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/images/Attic/Undelete24.gif,v
diff -u -N -r1.1 -r1.1.2.1
Binary files differ