diff --git a/changelog.html b/changelog.html
index 5c3db06563d3c3d77464ad0739f4b6ffccfbd0c9..5e83cc80f099f729b304d5ae5f7c0cd34d56da0a 100644
--- a/changelog.html
+++ b/changelog.html
@@ -68,6 +68,9 @@ Upcoming changes</a>
     Split matrix authorization strategies into an independent plugin.
   <li class='rfe'>
     UI Samples plugin fully separated from core. To view samples during plugin development or at any other time, just install from the update center.
+  <li class=bug>
+    View description should be clearly separated from the Jenkins system message.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18633">issue 18633</a>)
   <li class=bug>
     SCM polling sometimes broken since 1.527 due to a change in how environment variables are calculated.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19307">issue 19307</a>)
diff --git a/core/src/main/java/hudson/model/AllView.java b/core/src/main/java/hudson/model/AllView.java
index 5d9b235769b7c75ad3aa1cd5a061a8b5af95b07b..0bc73d3c58bb53b69d8c7f5d429b980386fd55be 100644
--- a/core/src/main/java/hudson/model/AllView.java
+++ b/core/src/main/java/hudson/model/AllView.java
@@ -23,7 +23,6 @@
  */
 package hudson.model;
 
-import jenkins.model.Jenkins;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
@@ -53,11 +52,6 @@ public class AllView extends View {
         this.owner = owner;
     }
     
-    @Override
-    public String getDescription() {
-        return Jenkins.getInstance().getDescription();
-    }
-
     @Override
     public boolean isEditable() {
         return false;
@@ -82,14 +76,6 @@ public class AllView extends View {
         return (Collection)getOwnerItemGroup().getItems();
     }
 
-    @Override
-    public synchronized void doSubmitDescription( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
-        checkPermission(Jenkins.ADMINISTER);
-
-        Jenkins.getInstance().setSystemMessage(req.getParameter("description"));
-        rsp.sendRedirect(".");
-    }
-
     @Override
     public String getPostConstructLandingPage() {
         return ""; // there's no configuration page
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
index d4bcdae590e5f6e3536f97205a3b1f11b072b0e6..e0259987ffada085c62be2c248e9ca41eb58068e 100644
--- a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-  <j:if test="${it.class.name=='hudson.model.Hudson'}">
+  <j:if test="${it.primaryView != null}">
     <j:set var="it" value="${it.primaryView}"/>
   </j:if>
   <l:ajax>
diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index 75c7cadce74331d1029ca1cd1c348ea39654ef58..464262f3203565aafc41f5be71b06fd41694dfe7 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -31,12 +31,10 @@ THE SOFTWARE.
           <st:include page="view-index-top.jelly" it="${it.owner}" optional="true">
             <!-- allow the owner to take over the top section, but we also need the default to be backward compatible -->
             <div id="view-message">
-              <j:if test="${it.class.name!='hudson.model.AllView'}">
                 <div id="systemmessage">
                   <j:out value="${app.systemMessage!=null ? app.markupFormatter.translate(app.systemMessage) : ''}" />
                 </div>
-              </j:if>            
-              <t:editableDescription permission="${app.ADMINISTER}"/>
+              <t:editableDescription permission="${it.CONFIGURE}"/>
             </div>
           </st:include>