diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
index 70230bbe4..3b149d48c 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
@@ -194,6 +194,19 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
     {
         if (evt.getNewState().equals(RegistrationState.REGISTERED))
         {
+            Address subscribeAddress = null;
+            try
+            {
+                subscribeAddress = getSubscribeAddress();
+            }
+            catch (ParseException e)
+            {
+                logger.error("Failed to parse mailbox subscribe address.", e);
+            }
+
+            final MessageSummarySubscriber defaultSubscriber
+                = new MessageSummarySubscriber(subscribeAddress);
+
             messageWaitingSubscriber =
                 new EventPackageSubscriber(
                         provider,
@@ -231,23 +244,26 @@ protected Subscription getSubscription(String callId)
                             if(s instanceof MessageSummarySubscriber)
                                 return (MessageSummarySubscriber)s;
 
-                        return null;
+                        // We are returning default subscriber because of early
+                        // NOTIFICATION messages and NOTIFICATION messages that
+                        // are not from the same dialog. That way we also handle
+                        // some NOTIFICATIONS that are send regardless of
+                        // subscription failure. We noticed this behavior from
+                        // some SIP servers.
+                        return defaultSubscriber;
                     }
                 };
 
-            try
+            if(subscribeAddress != null)
             {
-                final Address subscribeAddress = getSubscribeAddress();
-
-                if(subscribeAddress != null)
+                try
                 {
-                    messageWaitingSubscriber.subscribe(
-                            new MessageSummarySubscriber(subscribeAddress));
+                    messageWaitingSubscriber.subscribe(defaultSubscriber);
+                }
+                catch(Throwable e)
+                {
+                    logger.error("Error subscribing for mailbox", e);
                 }
-            }
-            catch(Throwable e)
-            {
-                logger.error("Error subscribing for mailbox", e);
             }
         }
         else if (evt.getNewState().equals(RegistrationState.UNREGISTERING))