diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9aecfa50d..465a16acc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
     * Added Base32 encode/decode class
     * Added a new `User::find()` method
 1. [](#improved)
+    * Moved `messages` object into core Grav from login plugin
     * Added `getTaxonomyItemKeys` to the Taxonomy object [#1124](https://github.com/getgrav/grav/issues/1124)
     * Added a `redirect_me` Twig function [#1124](https://github.com/getgrav/grav/issues/1124)
     * Added a Caddyfile for newer Caddy versions [#1115](https://github.com/getgrav/grav/issues/1115)
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 20fc5d554..c18fa4c2a 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -29,6 +29,7 @@ class Grav extends Container
         'events'                  => 'RocketTheme\Toolbox\Event\EventDispatcher',
         'cache'                   => 'Grav\Common\Cache',
         'session'                 => 'Grav\Common\Session',
+        'Grav\Common\Service\MessagesServiceProvider',
         'plugins'                 => 'Grav\Common\Plugins',
         'themes'                  => 'Grav\Common\Themes',
         'twig'                    => 'Grav\Common\Twig\Twig',
diff --git a/system/src/Grav/Common/Service/MessagesServiceProvider.php b/system/src/Grav/Common/Service/MessagesServiceProvider.php
new file mode 100644
index 000000000..78238fb9b
--- /dev/null
+++ b/system/src/Grav/Common/Service/MessagesServiceProvider.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use RocketTheme\Toolbox\Session\Message;
+
+class MessagesServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container)
+    {
+        // Define session message service.
+        $container['messages'] = function ($c) {
+            $session = $c['session'];
+
+            if (!isset($session->messages)) {
+                $session->messages = new Message;
+            }
+
+            return $session->messages;
+        };
+    }
+}