diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 65352f5d4..1ee3748c7 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1017,12 +1017,12 @@ result affected by the current active context.
     2  1d  Home     Clean the dishes   1.14
 
     $ task context home
-    Context 'home' applied.
+    Context 'home' set. Use 'task context none' to remove.
 
     $ task list
     ID Age Project  Description        Urg
     2  1d  Home     Clean the dishes   1.14
-    Context 'home' applied.
+    Context 'home' set. Use 'task context none' to remove.
 
 As seen in the example above, context is applied by specifying its name to the
 "context" command. To change the currently applied context, just pass the
diff --git a/src/CLI.cpp b/src/CLI.cpp
index e059ea3a2..3b1bc1c43 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -414,7 +414,7 @@ void CLI::addContextFilter ()
   {
     addRawFilter("( " + contextFilter + " )");
     if (context.verbose ("context"))
-      context.footnote (format("Context '{1}' applied.", contextName));
+      context.footnote (format("Context '{1}' set. Use 'task context none' to remove.", contextName));
   }
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 20d76442b..8c22842a5 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -570,7 +570,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index cc7838142..5050bdf5f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -570,7 +570,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index cef22854d..ed299fcd4 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -570,7 +570,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 6eb6e64e3..f1964b0b6 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -579,7 +579,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index cdc7bbcb9..b997ec4dc 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -570,7 +570,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b3ec61fb1..ef4b36cdb 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -569,7 +569,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index c296c2700..7d95eeecb 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -570,7 +570,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1587291ae..f446a4cea 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -570,7 +570,7 @@
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
 #define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
 #define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' applied."
+#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
 #define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
 #define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
 #define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
diff --git a/test/context.t b/test/context.t
index a185c77bc..5558da479 100755
--- a/test/context.t
+++ b/test/context.t
@@ -182,7 +182,7 @@ class ContextManagementTest(TestCase):
         self.t(('context', 'define', 'home', '+home'))[1]
 
         output = self.t(('context', 'home'))[1]
-        self.assertIn("Context 'home' applied.", output)
+        self.assertIn("Context 'home' set.", output)
         self.assertIn("context=home\n", self.t.taskrc_content)
 
     def test_context_resetting(self):
@@ -195,7 +195,7 @@ class ContextManagementTest(TestCase):
 
         self.t(('context', 'home'))[1]
         output = self.t(('context', 'home'))[1]
-        self.assertIn("Context 'home' applied.", output)
+        self.assertIn("Context 'home' set.", output)
 
         contains_home = lambda line: line == "context=home\n"
         self.assertEqual(len(filter(contains_home, self.t.taskrc_content)), 1)
@@ -213,20 +213,20 @@ class ContextManagementTest(TestCase):
 
         # Switch to home context
         output = self.t(('context', 'home'))[1]
-        self.assertIn("Context 'home' applied.", output)
+        self.assertIn("Context 'home' set.", output)
 
         self.assertEqual(len(filter(contains_home, self.t.taskrc_content)), 1)
 
         # Switch to work context
         output = self.t(('context', 'work'))[1]
-        self.assertIn("Context 'work' applied.", output)
+        self.assertIn("Context 'work' set.", output)
 
         self.assertNotIn("context=home\n", self.t.taskrc_content)
         self.assertEqual(len(filter(contains_work, self.t.taskrc_content)), 1)
 
         # Switch back to home context
         output = self.t(('context', 'home'))[1]
-        self.assertIn("Context 'home' applied.", output)
+        self.assertIn("Context 'home' set.", output)
 
         self.assertNotIn("context=work\n", self.t.taskrc_content)
         self.assertEqual(len(filter(contains_home, self.t.taskrc_content)), 1)