diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 27ab3587c..382a19502 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@ add_library (task CLI2.cpp CLI2.h
                   feedback.cpp
                   i18n.h
                   legacy.cpp
+                  nag.cpp
                   recur.cpp
                   rules.cpp
                   sort.cpp
diff --git a/src/main.h b/src/main.h
index a48380814..650aef1b8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -41,6 +41,8 @@ void handleRecurrence ();
 Datetime getNextRecurrence (Datetime&, std::string&);
 bool generateDueDates (Task&, std::vector <Datetime>&);
 void updateRecurrenceMask (Task&);
+
+// nag.cpp
 bool nag (Task&);
 
 // rules.cpp
diff --git a/src/nag.cpp b/src/nag.cpp
new file mode 100644
index 000000000..2a5bc0faf
--- /dev/null
+++ b/src/nag.cpp
@@ -0,0 +1,65 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <Context.h>
+
+extern Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+// Returns a Boolean indicator as to whether a nag message was generated, so
+// that commands can control the number of nag messages displayed (ie one is
+// enough).
+//
+// Otherwise generates a nag message, if one is defined, if there are tasks of
+// higher urgency.
+bool nag (Task& task)
+{
+  // Special tag overrides nagging.
+  if (task.hasTag ("nonag"))
+    return false;
+
+  auto msg = context.config.get ("nag");
+  if (msg != "")
+  {
+    // Scan all pending, non-recurring tasks.
+    auto pending = context.tdb2.pending.get_tasks ();
+    for (auto& t : pending)
+    {
+      if ((t.getStatus () == Task::pending ||
+           t.getStatus () == Task::waiting) &&
+          t.urgency () > task.urgency ())
+      {
+        context.footnote (msg);
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/recur.cpp b/src/recur.cpp
index 989cd1467..427d51a48 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -413,36 +413,3 @@ void updateRecurrenceMask (Task& task)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Returns a Boolean indicator as to whether a nag message was generated, so
-// that commands can control the number of nag messages displayed (ie one is
-// enough).
-//
-// Otherwise generates a nag message, if one is defined, if there are tasks of
-// higher urgency.
-bool nag (Task& task)
-{
-  // Special tag overrides nagging.
-  if (task.hasTag ("nonag"))
-    return false;
-
-  auto nagMessage = context.config.get ("nag");
-  if (nagMessage != "")
-  {
-    // Scan all pending, non-recurring tasks.
-    auto pending = context.tdb2.pending.get_tasks ();
-    for (auto& t : pending)
-    {
-      if ((t.getStatus () == Task::pending ||
-           t.getStatus () == Task::waiting) &&
-          t.urgency () > task.urgency ())
-      {
-        context.footnote (nagMessage);
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////