diff --git a/src/deprecated.cpp b/src/deprecated.cpp
index fb2fa887b1..4e19f39894 100644
--- a/src/deprecated.cpp
+++ b/src/deprecated.cpp
@@ -1,4 +1,3 @@
-// clang-format off
 /* ----------------------------------------------------------------------
    LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
    https://www.lammps.org/, Sandia National Laboratories
@@ -31,24 +30,27 @@ void Deprecated::command(int narg, char **arg)
   const std::string cmd = input->command;
 
   if (cmd == "DEPRECATED") {
-    if (lmp->comm->me == 0)
-      utils::logmesg(lmp,"\nCommand 'DEPRECATED' is a dummy command\n\n");
+    if (lmp->comm->me == 0) utils::logmesg(lmp, "\nCommand 'DEPRECATED' is a dummy command\n\n");
     return;
   } else if (cmd == "reset_ids") {
     if (lmp->comm->me == 0)
-      utils::logmesg(lmp,"\n'reset_ids' has been renamed to 'reset_atom_ids'\n\n");
-  } else if (utils::strmatch(cmd,"^kim_")) {
+      utils::logmesg(lmp, "\n'reset_ids' has been renamed to 'reset_atom_ids'\n\n");
+  } else if (utils::strmatch(cmd, "^kim_")) {
     if (lmp->comm->me == 0)
-      utils::logmesg(lmp,"\nWARNING: 'kim_<command>' has been renamed to "
-                      "'kim <command>'. Please update your input.\n\n");
+      utils::logmesg(lmp,
+                     "\nWARNING: 'kim_<command>' has been renamed to 'kim <command>'. "
+                     "Please update your input.\n\n");
     std::string newcmd("kim");
     newcmd += " " + cmd.substr(4);
-    for (int i=0; i < narg; ++i) {
-       newcmd.append(1,' ');
-       newcmd.append(arg[i]);
+    for (int i = 0; i < narg; ++i) {
+      newcmd.append(1, ' ');
+      newcmd.append(arg[i]);
     }
     input->one(newcmd);
     return;
+  } else if ((cmd == "message") || (cmd == "server")) {
+    if (lmp->comm->me == 0)
+      utils::logmesg(lmp, "\nThe MESSAGE package has been replaced by the MDI package.\n\n");
   }
-  error->all(FLERR,"This command is no longer available");
+  error->all(FLERR, "This command is no longer available");
 }
diff --git a/src/deprecated.h b/src/deprecated.h
index 609d0f9326..9f91a4cc27 100644
--- a/src/deprecated.h
+++ b/src/deprecated.h
@@ -20,6 +20,8 @@ CommandStyle(kim_interactions,Deprecated);
 CommandStyle(kim_param,Deprecated);
 CommandStyle(kim_property,Deprecated);
 CommandStyle(kim_query,Deprecated);
+CommandStyle(message,Deprecated);
+CommandStyle(server,Deprecated);
 // clang-format on
 #else
 
diff --git a/src/fix_deprecated.cpp b/src/fix_deprecated.cpp
index e33198091b..017ae9ff1b 100644
--- a/src/fix_deprecated.cpp
+++ b/src/fix_deprecated.cpp
@@ -46,10 +46,12 @@ FixDeprecated::FixDeprecated(LAMMPS *lmp, int narg, char **arg) :
   } else if (my_style == "lb/pc") {
     utils::logmesg(lmp,"\nFix style 'lb/pc' has been removed from the LATBOLTZ"
                      " package; 'fix nve' can be used in its place.\n\n");
-  }
-  else if (my_style == "lb/rigid/pc/sphere") {
+  } else if (my_style == "lb/rigid/pc/sphere") {
     utils::logmesg(lmp,"\nFix style 'lb/rigid/pc/sphere' has been removed from"
                    " the LATBOLTZ package; 'fix rigid' can be used in its place.\n\n");
+  } else if (my_style == "client/md") {
+    if (lmp->comm->me == 0)
+      utils::logmesg(lmp, "\nThe MESSAGE package has been replaced by the MDI package.\n\n");
   }
   error->all(FLERR,"This fix style is no longer available");
 }
diff --git a/src/fix_deprecated.h b/src/fix_deprecated.h
index 84da35a749..db7f47abcc 100644
--- a/src/fix_deprecated.h
+++ b/src/fix_deprecated.h
@@ -19,6 +19,7 @@ FixStyle(ave/spatial,FixDeprecated);
 FixStyle(ave/spatial/sphere,FixDeprecated);
 FixStyle(lb/pc,FixDeprecated);
 FixStyle(lb/rigid/pc/sphere,FixDeprecated);
+FixStyle(client/md,FixDeprecated);
 // clang-format on
 #else