diff --git a/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java b/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java
index 49b72ff9e..33798a9f9 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java
@@ -20,9 +20,6 @@
  * 'a' used for other purposes. This may be one of those ambiguous letters that
  * every server interprets differently.)
  *
- * FIXME Verify implementation of AWAY status message (auto-answering by
- * server).
- *
  * @author Danny van Heumen
  */
 public class PresenceManager
@@ -56,12 +53,12 @@ public class PresenceManager
     /**
      * Active away message.
      */
-    private String currentMessage;
+    private String currentMessage = "";
 
     /**
      * Proposed away message.
      */
-    private String submittedMessage;
+    private String submittedMessage = "";
 
     /**
      * Constructor.
@@ -110,7 +107,7 @@ public boolean isAway()
      */
     public String getMessage()
     {
-        return this.away ? this.currentMessage : "";
+        return this.currentMessage;
     }
 
     /**
@@ -187,7 +184,8 @@ public void onServerNumericMessage(final ServerNumericMessage msg)
                 PresenceManager.this.away = true;
                 operationSet.updatePresenceStatus(IrcStatusEnum.ONLINE,
                     IrcStatusEnum.AWAY);
-                LOGGER.debug("Away status enabled.");
+                LOGGER.debug("Away status enabled with message \""
+                    + PresenceManager.this.currentMessage + "\"");
                 break;
             default:
                 break;