diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
index a473d66f1..7fcb36135 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
@@ -320,7 +320,7 @@ public class ConferenceUtils {
case registration_required:
return Res.getString("message.error.not.member");
default:
- String reason = error.getConditionText() == null ? error.getCondition().toString() : error.getConditionText();
+ String reason = error.getDescriptiveText() == null ? error.getCondition().toString() : error.getDescriptiveText();
return Res.getString("message.default.error") + ": " + reason;
}
diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java
index 00992bde9..734bfcbbc 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java
@@ -249,7 +249,9 @@ public class JoinRoomSwingWorker extends SwingWorker
if ( errors.size() > 0 )
{
String error = errors.get( 0 );
- JOptionPane.showMessageDialog( SparkManager.getMainWindow(), error, Res.getString("message.error.unable.join.room"), JOptionPane.ERROR_MESSAGE );
+ final String style = "width: 300px;";
+ String body = ""+ roomJID + ": " + Res.getString("message.error.unable.join.room") +"
" + error + "
";
+ JOptionPane.showMessageDialog( SparkManager.getMainWindow(), body, Res.getString("message.error.unable.join.room"), JOptionPane.ERROR_MESSAGE );
}
else if ( groupChat.isJoined() && getValue() != null )
{