diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java
index 447644ae7..61e5d1fd2 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java
@@ -368,13 +368,14 @@ Log.warning( "Unable to broadcast.", e1 );
        
         
         for (String jid : jids) {
-            final Message message = new Message();
-            message.setType(normalMessageButton.isSelected() ? Message.Type.normal : Message.Type.headline);
             String nickname = SparkManager.getUserManager().getUserNicknameFromJID(JidCreate.bareFromOrThrowUnchecked(jid));
             recipients.add(nickname);
-            message.setTo(JidCreate.fromOrThrowUnchecked(jid));
+
+            final Message message = new Message();
+            message.setType(normalMessageButton.isSelected() ? Message.Type.normal : Message.Type.headline);
             message.setBody(text);
-            
+            message.setTo(JidCreate.fromOrThrowUnchecked(jid));
+
             try {
                 SparkManager.getConnection().sendStanza(message);
             } catch (InterruptedException e) {