diff --git a/source/org/jivesoftware/smackx/DefaultMessageEventRequestListener.java b/source/org/jivesoftware/smackx/DefaultMessageEventRequestListener.java
index cc795ca53..f31e54791 100644
--- a/source/org/jivesoftware/smackx/DefaultMessageEventRequestListener.java
+++ b/source/org/jivesoftware/smackx/DefaultMessageEventRequestListener.java
@@ -63,60 +63,25 @@ package org.jivesoftware.smackx;
  */
 public class DefaultMessageEventRequestListener implements MessageEventRequestListener {
 
-    /**
-     * Called when a request of message delivered notification is received. The default
-     * behavior is to automatically respond that the message has been delivered.
-     *  
-     * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
-     * @param messageEventManager the messageEventManager that fired the listener.
-     */
-    public void deliveredNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager) {
+    public void deliveredNotificationRequested(String from, String packetID,
+                MessageEventManager messageEventManager)
+    {
         // Send to the message's sender that the message has been delivered
         messageEventManager.sendDeliveredNotification(from, packetID);
     }
 
-    /**
-     * Called when a request of message displayed notification is received.
-     *  
-     * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
-     * @param messageEventManager the messageEventManager that fired the listener.
-     */
-    public void displayedNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager) {
+    public void displayedNotificationRequested(String from, String packetID,
+            MessageEventManager messageEventManager)
+    {
     }
 
-    /**
-     * Called when a request that the receiver of the message is composing a reply notification is 
-     * received.
-     *  
-     * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
-     * @param messageEventManager the messageEventManager that fired the listener.
-     */
-    public void composingNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager) {
+    public void composingNotificationRequested(String from, String packetID,
+            MessageEventManager messageEventManager)
+    {
     }
 
-    /**
-     * Called when a request that the receiver of the message is offline is received.
-     *  
-     * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
-     * @param messageEventManager the messageEventManager that fired the listener.
-     */
-    public void offlineNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager) {
+    public void offlineNotificationRequested(String from, String packetID,
+            MessageEventManager messageEventManager)
+    {
     }
-
 }
diff --git a/source/org/jivesoftware/smackx/MessageEventNotificationListener.java b/source/org/jivesoftware/smackx/MessageEventNotificationListener.java
index 08bc16222..fcea6884c 100644
--- a/source/org/jivesoftware/smackx/MessageEventNotificationListener.java
+++ b/source/org/jivesoftware/smackx/MessageEventNotificationListener.java
@@ -66,7 +66,7 @@ public interface MessageEventNotificationListener {
      * Called when a notification of message delivered is received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      */
     public void deliveredNotification(String from, String packetID);
 
@@ -74,7 +74,7 @@ public interface MessageEventNotificationListener {
      * Called when a notification of message displayed is received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      */
     public void displayedNotification(String from, String packetID);
 
@@ -83,7 +83,7 @@ public interface MessageEventNotificationListener {
      * received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      */
     public void composingNotification(String from, String packetID);
 
@@ -91,7 +91,7 @@ public interface MessageEventNotificationListener {
      * Called when a notification that the receiver of the message is offline is received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      */
     public void offlineNotification(String from, String packetID);
 
@@ -100,7 +100,7 @@ public interface MessageEventNotificationListener {
      * is received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      */
     public void cancelledNotification(String from, String packetID);
 }
diff --git a/source/org/jivesoftware/smackx/MessageEventRequestListener.java b/source/org/jivesoftware/smackx/MessageEventRequestListener.java
index e9a7d5e8e..5678bbb58 100644
--- a/source/org/jivesoftware/smackx/MessageEventRequestListener.java
+++ b/source/org/jivesoftware/smackx/MessageEventRequestListener.java
@@ -78,49 +78,41 @@ public interface MessageEventRequestListener {
      * Called when a request for message delivered notification is received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      * @param messageEventManager the messageEventManager that fired the listener.
      */
-    public void deliveredNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager);
+    public void deliveredNotificationRequested(String from, String packetID,
+            MessageEventManager messageEventManager);
 
     /**
      * Called when a request for message displayed notification is received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      * @param messageEventManager the messageEventManager that fired the listener.
      */
-    public void displayedNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager);
+    public void displayedNotificationRequested(String from, String packetID,
+            MessageEventManager messageEventManager);
 
     /**
      * Called when a request that the receiver of the message is composing a reply notification is 
      * received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      * @param messageEventManager the messageEventManager that fired the listener.
      */
-    public void composingNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager);
+    public void composingNotificationRequested(String from, String packetID,
+                MessageEventManager messageEventManager);
 
     /**
      * Called when a request that the receiver of the message is offline is received.
      *  
      * @param from the user that sent the notification.
-     * @param packetId the id of the message that was sent.
+     * @param packetID the id of the message that was sent.
      * @param messageEventManager the messageEventManager that fired the listener.
      */
-    public void offlineNotificationRequested(
-        String from,
-        String packetID,
-        MessageEventManager messageEventManager);
+    public void offlineNotificationRequested(String from, String packetID,
+            MessageEventManager messageEventManager);
 
 }