diff --git a/swad_changelog.h b/swad_changelog.h
index c34cca78a..d2efea7f0 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -222,13 +222,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.201 (2017-05-02)"
+#define Log_PLATFORM_VERSION	"SWAD 16.201.1 (2017-05-02)"
 #define CSS_FILE		"swad16.201.css"
 #define JS_FILE			"swad16.181.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
 /*
+        Version 16.201.1: May 02, 2017	Code refactoring in messages. (218241 lines)
         Version 16.201:   May 02, 2017	Change layout of contextual icons in assignments, surveys and attendance. (218344 lines)
         Version 16.200.1: May 02, 2017	Fixed problem printing view of students, teachers and guests. (218331 lines)
         Version 16.200:   May 02, 2017	Print view of an assignment, suggested by Sandra Daniela Tazzioli Barroso. (218337 lines)
diff --git a/swad_message.c b/swad_message.c
index 840c96632..2845fba0c 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -93,10 +93,6 @@ static void Msg_ConstructQueryToSelectSentOrReceivedMsgs (char Query[Msg_MAX_BYT
 static char *Msg_WriteNumMsgs (unsigned NumUnreadMsgs);
 
 static void Msg_PutIconsListMsgs (void);
-static void Msg_PutIconToRemoveOneRcvMsg (void);
-static void Msg_PutIconToRemoveSevRcvMsgs (void);
-static void Msg_PutIconToRemoveOneSntMsg (void);
-static void Msg_PutIconToRemoveSevSntMsgs (void);
 
 static void Msg_ShowFormToShowOnlyUnreadMessages (void);
 static void Msg_GetParamOnlyUnreadMsgs (void);
@@ -2411,87 +2407,15 @@ static char *Msg_WriteNumMsgs (unsigned NumUnreadMsgs)
 static void Msg_PutIconsListMsgs (void)
   {
    /***** Put icons to remove messages *****/
-   switch (Gbl.Msg.TypeOfMessages)
-     {
-      case Msg_MESSAGES_RECEIVED:
-	 if (Gbl.Msg.NumMsgs == 1)
-	    Msg_PutIconToRemoveOneRcvMsg ();
-	 else if (Gbl.Msg.NumMsgs > 1)
-	    Msg_PutIconToRemoveSevRcvMsgs ();
-	 break;
-      case Msg_MESSAGES_SENT:
-	 if (Gbl.Msg.NumMsgs == 1)
-	    Msg_PutIconToRemoveOneSntMsg ();
-	 else if (Gbl.Msg.NumMsgs > 1)
-	    Msg_PutIconToRemoveSevSntMsgs ();
-	 break;
-     }
+   Lay_PutContextualIconToRemove ((Gbl.Msg.TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg :
+                                                                                      ActReqDelAllSntMsg,
+                                  Msg_PutHiddenParamsMsgsFilters);
 
    /***** Put icon to show a figure *****/
    Gbl.Stat.FigureType = Sta_MESSAGES;
    Sta_PutIconToShowFigure ();
   }
 
-/*****************************************************************************/
-/***************** Put icon to remove one received message *******************/
-/*****************************************************************************/
-
-static void Msg_PutIconToRemoveOneRcvMsg (void)
-  {
-   extern const char *Txt_Remove_this_message;
-
-   Lay_PutContextualLink (ActReqDelAllRcvMsg,NULL,
-                          Msg_PutHiddenParamsMsgsFilters,
-			  "remove-on64x64.png",
-			  Txt_Remove_this_message,NULL,
-                          NULL);
-  }
-
-/*****************************************************************************/
-/*************** Put icon to remove several received messages ****************/
-/*****************************************************************************/
-
-static void Msg_PutIconToRemoveSevRcvMsgs (void)
-  {
-   extern const char *Txt_Remove_these_messages;
-
-   Lay_PutContextualLink (ActReqDelAllRcvMsg,NULL,
-                          Msg_PutHiddenParamsMsgsFilters,
-			  "remove-on64x64.png",
-			  Txt_Remove_these_messages,NULL,
-                          NULL);
-  }
-
-/*****************************************************************************/
-/******************** Put icon to remove one sent message ********************/
-/*****************************************************************************/
-
-static void Msg_PutIconToRemoveOneSntMsg (void)
-  {
-   extern const char *Txt_Remove_this_message;
-
-   Lay_PutContextualLink (ActReqDelAllSntMsg,NULL,
-                          Msg_PutHiddenParamsMsgsFilters,
-			  "remove-on64x64.png",
-			  Txt_Remove_this_message,NULL,
-                          NULL);
-  }
-
-/*****************************************************************************/
-/***************** Put icon to remove several sent messages ******************/
-/*****************************************************************************/
-
-static void Msg_PutIconToRemoveSevSntMsgs (void)
-  {
-   extern const char *Txt_Remove_these_messages;
-
-   Lay_PutContextualLink (ActReqDelAllSntMsg,NULL,
-                          Msg_PutHiddenParamsMsgsFilters,
-			  "remove-on64x64.png",
-			  Txt_Remove_these_messages,NULL,
-                          NULL);
-  }
-
 /*****************************************************************************/
 /***** Write a form parameter to specify filter "from"/"to" for messages *****/
 /*****************************************************************************/
diff --git a/swad_text.c b/swad_text.c
index f4d956fb8..278d69219 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -31505,27 +31505,6 @@ const char *Txt_Remove_survey =
 	"Remover inquérito";
 #endif
 
-const char *Txt_Remove_this_message =
-#if   L==1
-	"Eliminar aquest missatge";
-#elif L==2
-	"Diese Nachricht entfernen";
-#elif L==3
-	"Remove this message";
-#elif L==4
-	"Eliminar este mensaje";
-#elif L==5
-	"Supprimer ce message";
-#elif L==6
-	"Eliminar este mensaje";	// Okoteve traducción
-#elif L==7
-	"Rimuovere questo messaggio";
-#elif L==8
-	"Usuń tę wiadomość";
-#elif L==9
-	"Remover esta mensagem";
-#endif
-
 const char *Txt_Remove_thread =
 #if   L==1
 	"Eliminar discusión";	// Necessita traduccio
@@ -31589,27 +31568,6 @@ const char *Txt_Remove_the_users_indicated_in_step_1 =
 	"Tirar os utilizadores que estão na lista";
 #endif
 
-const char *Txt_Remove_these_messages =
-#if   L==1
-	"Eliminar aquests missatges";
-#elif L==2
-	"Diese Nachrichten entfernen";
-#elif L==3
-	"Remove these messages";
-#elif L==4
-	"Eliminar estos mensajes";
-#elif L==5
-	"Supprimer ces messages";
-#elif L==6
-	"Eliminar estos mensajes";	// Okoteve traducción
-#elif L==7
-	"Rimuovere questi messaggi";
-#elif L==8
-	"Usuń te wiadomości";
-#elif L==9
-	"Remover estas mensagens";
-#endif
-
 const char *Txt_Remove_type_of_group =
 #if   L==1
 	"Eliminar tipo de grupo";	// Necessita traduccio