diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 21ac7767c9a37f31adcb2d121e0200de90fa2f9b..b1d9dfeb587a2d755c8a2eafaeff54aa90d2a6fd 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -710,6 +710,7 @@ public class Util {
      * Escapes HTML unsafe characters like <, & to the respective character entities.
      */
     public static String escape(String text) {
+        if (text==null)     return null;
         StringBuilder buf = new StringBuilder(text.length()+64);
         for( int i=0; i<text.length(); i++ ) {
             char ch = text.charAt(i);
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index 0e136d171cc52a0de95429777bf3a6e31b5c6b58..43f308ba3af27e23eb6114b8315f82675280369b 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -107,7 +107,7 @@ public class FileParameterValue extends ParameterValue {
 	}
 	
 	@Override
-    public String toString() {
+    public String getShortDescription() {
     	return "(FileParameterValue) " + getName() + "='" + file.getName() + "'";
     }
     
diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java
index 85ac74a499714a3305587353a16304fca5300814..a431eaa0900af98b4ce5c2e5b997a14d7d57f03e 100644
--- a/core/src/main/java/hudson/model/ParameterValue.java
+++ b/core/src/main/java/hudson/model/ParameterValue.java
@@ -196,4 +196,16 @@ public abstract class ParameterValue implements Serializable {
 		return true;
 	}
 
+    /**
+     * Computes a human-readable possible-localized one-line description of the parameter value.
+     *
+     * <P>
+     * This message is used as a tooltip to describe jobs in the queue. The text should be one line without
+     * new line. No HTML allowed (the caller will perform necessary HTML escapes, so any text can be returend.)
+     *
+     * @since 1.323
+     */
+    public String getShortDescription() {
+        return toString();
+    }
 }
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 2a5cdeab5b99d33c113787372c669bd8cffe84d3..9ec8876f15e8e58d364d531a55190183129bd36a 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -1153,16 +1153,16 @@ public class Queue extends ResourceController implements Saveable {
          */
         @Exported
         public String getParams() {
-        	String s = "";
+        	StringBuilder s = new StringBuilder();
         	for(Action action : getActions()) {
         		if(action instanceof ParametersAction) {
         			ParametersAction pa = (ParametersAction)action;
         			for (ParameterValue p : pa.getParameters()) {
-        				s = s + "<br>" + p.toString();
+        				s.append('\n').append(p.getShortDescription());
         			}
         		}
         	}
-        	return s;
+        	return s.toString();
         }
         
         public boolean hasCancelPermission() {
diff --git a/core/src/main/java/hudson/model/RunParameterValue.java b/core/src/main/java/hudson/model/RunParameterValue.java
index 3ed2f6051645b12f38a605046ecf3dd91865f3c8..f7daf600e99dd0c2cb76642f078d73f403139239 100644
--- a/core/src/main/java/hudson/model/RunParameterValue.java
+++ b/core/src/main/java/hudson/model/RunParameterValue.java
@@ -27,13 +27,6 @@ import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.util.Map;
 
-import com.thoughtworks.xstream.converters.Converter;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import hudson.util.Secret;
-
 public class RunParameterValue extends ParameterValue {
 
     private final String runId;
@@ -66,7 +59,7 @@ public class RunParameterValue extends ParameterValue {
     }
     
     @Override
-    public String toString() {
+    public String getShortDescription() {
     	return "(RunParameterValue) " + getName() + "='" + getRunId() + "'";
     }
 
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index ba29f93cc116d806aba1c04d6a9e82abca1e2684..b04405b4070d9639129622a493c32f7c6acfdbaf 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -57,7 +57,7 @@ THE SOFTWARE.
       <j:otherwise>
         <j:forEach var="item" items="${items}">
           <tr>
-            <td class="pane" width="100%" tooltip="${item.why}${item.params}" style="white-space: normal;">
+            <td class="pane" width="100%" tooltip="${item.why}${h.escape(item.params)}" style="white-space: normal;">
               <j:set var="stuck" value="${item.isStuck()}"/>
               <j:choose>
                 <j:when test="${h.hasPermission(item.task,item.task.READ)}">