diff --git a/src/Umbraco.Core/DependencyInjection/ServicesCompositionRoot.cs b/src/Umbraco.Core/DependencyInjection/ServicesCompositionRoot.cs
index 0326072447..4f74797f45 100644
--- a/src/Umbraco.Core/DependencyInjection/ServicesCompositionRoot.cs
+++ b/src/Umbraco.Core/DependencyInjection/ServicesCompositionRoot.cs
@@ -21,8 +21,9 @@ namespace Umbraco.Core.DependencyInjection
         {
             container.RegisterSingleton<IPublishingStrategy, PublishingStrategy>();
 
-            //These will be replaced by the web boot manager when running in a web context
-            container.Register<IEventMessagesFactory, TransientMessagesFactory>();
+            // register a transient messages factory, which will be replaced byt the web
+            // boot manager when running in a web context
+            container.Register<IEventMessagesFactory, TransientEventMessagesFactory>();
             
             //the context
             container.RegisterSingleton<ServiceContext>();
diff --git a/src/Umbraco.Core/Events/IEventMessagesFactory.cs b/src/Umbraco.Core/Events/IEventMessagesFactory.cs
index cb2391186d..992220ab87 100644
--- a/src/Umbraco.Core/Events/IEventMessagesFactory.cs
+++ b/src/Umbraco.Core/Events/IEventMessagesFactory.cs
@@ -8,5 +8,7 @@ namespace Umbraco.Core.Events
     public interface IEventMessagesFactory
     {
         EventMessages Get();
+
+        EventMessages GetOrDefault();
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/TransientMessagesFactory.cs b/src/Umbraco.Core/Events/TransientEventMessagesFactory.cs
similarity index 58%
rename from src/Umbraco.Core/Events/TransientMessagesFactory.cs
rename to src/Umbraco.Core/Events/TransientEventMessagesFactory.cs
index 5cd291a37f..880332ac40 100644
--- a/src/Umbraco.Core/Events/TransientMessagesFactory.cs
+++ b/src/Umbraco.Core/Events/TransientEventMessagesFactory.cs
@@ -3,11 +3,16 @@ namespace Umbraco.Core.Events
     /// <summary>
     /// A simple/default transient messages factory
     /// </summary>
-    internal class TransientMessagesFactory : IEventMessagesFactory
+    internal class TransientEventMessagesFactory : IEventMessagesFactory
     {
         public EventMessages Get()
         {
             return new EventMessages();
         }
+
+        public EventMessages GetOrDefault()
+        {
+            return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 0533a7c82c..46f109731d 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -319,7 +319,7 @@
     <Compile Include="Events\MoveEventInfo.cs" />
     <Compile Include="Events\PublishEventArgs.cs" />
     <Compile Include="Events\RecycleBinEventArgs.cs" />
-    <Compile Include="Events\TransientMessagesFactory.cs" />
+    <Compile Include="Events\TransientEventMessagesFactory.cs" />
     <Compile Include="Events\TypedEventHandler.cs" />
     <Compile Include="Events\MoveEventArgs.cs" />
     <Compile Include="Events\NewEventArgs.cs" />
diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
index d1e96850b3..7c26e6924c 100644
--- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
+++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.Services
 			//here we are going to override the ServiceContext because normally with our test cases we use a
 			//global Database object but this is NOT how it should work in the web world or in any multi threaded scenario.
 			//we need a new Database object for each thread.
-		    var evtMsgs = new TransientMessagesFactory();
+		    var evtMsgs = new TransientEventMessagesFactory();
 		    ApplicationContext.Services = TestObjects.GetServiceContext(
                 repositoryFactory,
                 _uowProvider,
diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index 72008524a2..bc7d2e3ff4 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -113,7 +113,7 @@ namespace Umbraco.Tests.TestHelpers
             // but, that will NOT prevent _appContext from NOT being configured, because it cannot connect
             // to the database to check the migrations ;-(
 
-            var evtMsgs = new TransientMessagesFactory();
+            var evtMsgs = new TransientEventMessagesFactory();
             var databaseContext = new DatabaseContext(databaseFactory, Logger);
             var repositoryFactory = Container.GetInstance<RepositoryFactory>();
             var serviceContext = TestObjects.GetServiceContext(
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
index b88f5d4612..2c333c0a2c 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
@@ -215,7 +215,7 @@ namespace Umbraco.Tests.TestHelpers
         /// </summary>
         protected virtual void SetupApplicationContext()
         {
-            var evtMsgs = new TransientMessagesFactory();
+            var evtMsgs = new TransientEventMessagesFactory();
             ApplicationContext.Current = new ApplicationContext(
                 //assign the db context
                 new DatabaseContext(new DefaultDatabaseFactory(
diff --git a/src/Umbraco.Web/DefaultHttpContextAccessor.cs b/src/Umbraco.Web/DefaultHttpContextAccessor.cs
deleted file mode 100644
index 121c90e1af..0000000000
--- a/src/Umbraco.Web/DefaultHttpContextAccessor.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Web;
-
-namespace Umbraco.Web
-{
-    internal class DefaultHttpContextAccessor : IHttpContextAccessor
-    {
-        private readonly Func<HttpContextBase> _httpContext;
-
-        public DefaultHttpContextAccessor(Func<HttpContextBase> httpContext)
-        {
-            _httpContext = httpContext;
-        }
-
-        public HttpContextBase Value
-        {
-            get { return _httpContext(); }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/IHttpContextAccessor.cs b/src/Umbraco.Web/IHttpContextAccessor.cs
deleted file mode 100644
index 068783725a..0000000000
--- a/src/Umbraco.Web/IHttpContextAccessor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Web;
-
-namespace Umbraco.Web
-{
-    /// <summary>
-    /// Used to retrieve the HttpContext
-    /// </summary>
-    /// <remarks>
-    /// NOTE: This has a singleton lifespan
-    /// </remarks>
-    public interface IHttpContextAccessor
-    {
-        HttpContextBase Value { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/RequestLifespanMessagesFactory.cs b/src/Umbraco.Web/RequestLifespanMessagesFactory.cs
deleted file mode 100644
index 26ac3bd5df..0000000000
--- a/src/Umbraco.Web/RequestLifespanMessagesFactory.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using Umbraco.Core.Events;
-
-namespace Umbraco.Web
-{
-    /// <summary>
-    /// Stores the instance of EventMessages in the current request so all events will share the same instance
-    /// </summary>
-    internal class RequestLifespanMessagesFactory : IEventMessagesFactory
-    {
-        private readonly IHttpContextAccessor _httpAccessor;
-
-        public RequestLifespanMessagesFactory(IHttpContextAccessor httpAccessor)
-        {
-            if (httpAccessor == null) throw new ArgumentNullException("httpAccessor");
-            _httpAccessor = httpAccessor;
-        }
-
-        public EventMessages Get()
-        {
-            if (_httpAccessor.Value.Items[typeof (RequestLifespanMessagesFactory).Name] == null)
-            {
-                _httpAccessor.Value.Items[typeof(RequestLifespanMessagesFactory).Name] = new EventMessages();
-            }
-            return (EventMessages)_httpAccessor.Value.Items[typeof (RequestLifespanMessagesFactory).Name];
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/ScopeContextEventMessagesFactory.cs b/src/Umbraco.Web/ScopeContextEventMessagesFactory.cs
new file mode 100644
index 0000000000..66ee150b55
--- /dev/null
+++ b/src/Umbraco.Web/ScopeContextEventMessagesFactory.cs
@@ -0,0 +1,34 @@
+using System;
+using Umbraco.Core;
+using Umbraco.Core.Events;
+
+namespace Umbraco.Web
+{
+    /// <summary>
+    /// Stores the instance of EventMessages in the current scope context so all events will share the same instance.
+    /// </summary>
+    internal class ScopeContextEventMessagesFactory : IEventMessagesFactory
+    {
+        private readonly IScopeContextAdapter _scopeContextAdapter;
+        private const string ContextKey = nameof(ScopeContextEventMessagesFactory);
+
+        public ScopeContextEventMessagesFactory(IScopeContextAdapter scopeContextAdapter)
+        {
+            if (scopeContextAdapter == null) throw new ArgumentNullException(nameof(scopeContextAdapter));
+            _scopeContextAdapter = scopeContextAdapter;
+        }
+
+        public EventMessages Get()
+        {
+            var evtMsgs = (EventMessages) _scopeContextAdapter.Get(ContextKey);
+            if (evtMsgs == null)
+                _scopeContextAdapter.Set(ContextKey, evtMsgs = new EventMessages());
+            return evtMsgs;
+        }
+
+        public EventMessages GetOrDefault()
+        {
+            return (EventMessages) _scopeContextAdapter.Get(ContextKey);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/SingletonHttpContextAccessor.cs b/src/Umbraco.Web/SingletonHttpContextAccessor.cs
deleted file mode 100644
index cdeafa48e1..0000000000
--- a/src/Umbraco.Web/SingletonHttpContextAccessor.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Web;
-
-namespace Umbraco.Web
-{
-    internal class SingletonHttpContextAccessor : IHttpContextAccessor
-    {
-        public HttpContextBase Value
-        {
-            get { return new HttpContextWrapper(HttpContext.Current); }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c8a70ba6e2..41c9338134 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -323,14 +323,12 @@
     <Compile Include="ApplicationContextExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="Cache\ICacheRefresher.cs" />
-    <Compile Include="DefaultHttpContextAccessor.cs" />
     <Compile Include="DefaultUmbracoContextAccessor.cs" />
     <Compile Include="DependencyInjection\WebModelMappersCompositionRoot.cs" />
     <Compile Include="Editors\BackOfficeNotificationsController.cs" />
     <Compile Include="LightInjectExtensions.cs" />
     <Compile Include="Editors\EditorValidationResolver.cs" />
     <Compile Include="Editors\EditorValidator.cs" />
-    <Compile Include="IHttpContextAccessor.cs" />
     <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
     <Compile Include="Editors\IEditorValidator.cs" />
     <Compile Include="Editors\EditorModelEventManager.cs" />
@@ -418,7 +416,7 @@
     <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="RequestLifespanMessagesFactory.cs" />
+    <Compile Include="ScopeContextEventMessagesFactory.cs" />
     <Compile Include="RouteDataExtensions.cs" />
     <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
     <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
@@ -435,7 +433,6 @@
     <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
     <Compile Include="Services\ApplicationTreeService.cs" />
     <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
-    <Compile Include="SingletonHttpContextAccessor.cs" />
     <Compile Include="Trees\ContentTypeTreeController.cs" />
     <Compile Include="Trees\MediaTypeTreeController.cs" />
     <Compile Include="Trees\MemberTypeTreeController.cs" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj.DotSettings b/src/Umbraco.Web/Umbraco.Web.csproj.DotSettings
index 662f95686e..73e96563f9 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj.DotSettings
+++ b/src/Umbraco.Web/Umbraco.Web.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/Umbraco.Web/UmbracoContextExtensions.cs b/src/Umbraco.Web/UmbracoContextExtensions.cs
index 8cd38df6d1..42d8a5cfde 100644
--- a/src/Umbraco.Web/UmbracoContextExtensions.cs
+++ b/src/Umbraco.Web/UmbracoContextExtensions.cs
@@ -13,6 +13,9 @@ namespace Umbraco.Web
     /// </summary>
     public static class UmbracoContextExtensions
     {
+        // fixme - this class is generally ugly now that we have proper IoC
+        // the current umbraco context belongs to the ScopeContext not the HttpContext
+
         /// <summary>
         /// tries to get the Umbraco context from the HttpContext
         /// </summary>
@@ -53,10 +56,11 @@ namespace Umbraco.Web
         /// <returns></returns>
         public static EventMessages GetCurrentEventMessages(this UmbracoContext umbracoContext)
         {
-            var msgs = umbracoContext.HttpContext.Items[typeof (RequestLifespanMessagesFactory).Name];
-            if (msgs == null) return null;
-            return (EventMessages) msgs;
+            // fixme - this is ugly
+            // the event messages factory should be injected / supplied by the container to whoever needs it!
+            var scopeContextAdapter = new DefaultScopeContextAdapter();
+            var eventMessagesFactory = new ScopeContextEventMessagesFactory(scopeContextAdapter);
+            return eventMessagesFactory.GetOrDefault();
         }
-
     }
 }
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 545d7d7e24..1486d77774 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -338,7 +338,6 @@ namespace Umbraco.Web
 
             //no need to declare as per request, it's lifetime is already managed as a singleton
             container.Register<HttpContextBase>(factory => new HttpContextWrapper(HttpContext.Current));
-            container.RegisterSingleton<IHttpContextAccessor, DefaultHttpContextAccessor>();
             container.RegisterSingleton<IUmbracoContextAccessor, DefaultUmbracoContextAccessor>();
             container.RegisterSingleton<IPublishedContentCache>(factory => new PublishedContentCache());
             container.RegisterSingleton<IPublishedMediaCache, PublishedMediaCache>();
@@ -348,7 +347,7 @@ namespace Umbraco.Web
             container.RegisterSingleton<UmbracoHelper>();
 
             //Replace services:
-            container.Register<IEventMessagesFactory, RequestLifespanMessagesFactory>();
+            container.Register<IEventMessagesFactory, ScopeContextEventMessagesFactory>();
             container.RegisterSingleton<IApplicationTreeService, ApplicationTreeService>();
             container.RegisterSingleton<ISectionService, SectionService>();
         }