Index: include/AdblockPlus/Notification.h
diff --git a/include/AdblockPlus/Notification.h b/include/AdblockPlus/Notification.h
index c9b2b24ec28bcb5ad5d1e9bbdf1228e81e10e3f4..2036c73732829154e587765b3cb93f2012ebaa4b 100644
--- a/include/AdblockPlus/Notification.h
+++ b/include/AdblockPlus/Notification.h
@@ -36,13 +36,23 @@ namespace AdblockPlus
   };
 
   /**
+   * Contains notification title and message. It's returned by
+   * `Notification::GetTexts`.
+   */
+  struct NotificationTexts
+  {
+    std::string title;
+    std::string message;
+  };
+
+  /**
    * Wrapper for an Adblock Plus notification object.
    */
-  class Notification: public JsValue
+  class Notification : public JsValue,
+                       public std::tr1::enable_shared_from_this<Notification>
   {
     friend class FilterEngine;
   protected:
-    static std::tr1::shared_ptr<Notification> JsValueToNotification(const JsValuePtr& jsValue);
     /**
      * Constructor.
      * @param jsValue `JsValuePtr` notification JavaScript object.
@@ -55,17 +65,11 @@ namespace AdblockPlus
      */
     NotificationType GetType() const;
 
-    /**
-     * Retrieves the title of this notification.
-     * @return Title of this notification.
-     */
-    const std::string& GetTitle() const;
-
-    /**
-     * Retrieves the message of this notification.
-     * @return Message of this notification.
-     */
-    const std::string& GetMessageString() const;
+    /**
+     * Retrieves the title and message of this notification.
+     * @return Translated texts.
+     */
+    NotificationTexts GetTexts();
 
     /**
      * Marks this notification as shown. It is only relevant for question
@@ -73,9 +77,6 @@ namespace AdblockPlus
      */
     void MarkAsShown();
   private:
-    std::string title;
-    std::string message;
-    NotificationType type;
   };
   typedef std::tr1::shared_ptr<Notification> NotificationPtr;
 }