diff --git a/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java b/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
index 50cba6a25..776269e7c 100644
--- a/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
+++ b/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
@@ -116,7 +116,7 @@ public class ChatRoomImpl extends ChatRoom {
 
         // The name of the room will be the node of the user jid + conversation.
         final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a");
-        this.roomTitle = participantNickname + " - Started " + formatter.format(new Date());
+        this.roomTitle = participantNickname;
 
         // Add RoomInfo
         this.getSplitPane().setRightComponent(null);
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
index 8376e0653..0fbde9868 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
@@ -17,6 +17,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smackx.packet.DelayInformation;
 import org.jivesoftware.smackx.packet.VCard;
 import org.jivesoftware.spark.SparkManager;
 import org.jivesoftware.spark.component.InputDialog;
@@ -162,6 +163,13 @@ public class BroadcastPlugin implements Plugin, PacketListener {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 final Message message = (Message)packet;
+
+                // Do not handle errors or offline messages
+                final DelayInformation offlineInformation = (DelayInformation)message.getExtension("x", "jabber:x:delay");
+                if (offlineInformation != null || message.getError() != null) {
+                    return;
+                }
+
                 boolean broadcast = message.getProperty("broadcast") != null;
 
                 if ((broadcast || (message.getType() == Message.Type.NORMAL) || message.getType() == Message.Type.HEADLINE) && message.getBody() != null) {
diff --git a/src/plugins/apple/src/plugin.xml b/src/plugins/apple/src/plugin.xml
index 228c100f5..e20f31138 100644
--- a/src/plugins/apple/src/plugin.xml
+++ b/src/plugins/apple/src/plugin.xml
@@ -6,7 +6,7 @@
     <homePage>http://www.jivesoftware.com</homePage>
     <email>andrew@jivesoftware.com</email>
     <description>Gives Spark mac notification capabilities and other enhancements.</description>
-    <class>org.jivesoftware.spark.plugin.apple.ApplePlugin</class>
+    <class>com.jivesoftware.spark.plugin.apple.ApplePlugin</class>
     <minSparkVersion>2.0.0.1</minSparkVersion>
 </plugin>
 
diff --git a/src/plugins/growl/src/plugin.xml b/src/plugins/growl/src/plugin.xml
index 035e49cbc..ede7ed68d 100644
--- a/src/plugins/growl/src/plugin.xml
+++ b/src/plugins/growl/src/plugin.xml
@@ -5,6 +5,6 @@
     <homePage>http://www.jivesoftware.com</homePage>
     <email>andrew@jivesoftware.com</email>
     <description>Provides Growl notifications on Mac OS X.(http://growl.info)</description>
-    <class>org.jivesoftware.spark.plugin.growl.GrowlPlugin</class>
+    <class>com.jivesoftware.spark.plugin.growl.GrowlPlugin</class>
     <minSparkVersion>2.0.0.1</minSparkVersion>
 </plugin>
\ No newline at end of file