diff --git a/classes/Notice.php b/classes/Notice.php
index a8561948b4..b22b4296e0 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1056,6 +1056,10 @@ class Notice extends Managed_DataObject
             $stored->setPref('ostatus', 'self', $self);
         }
 
+        if ($self && common_valid_http_url($self)) {
+            $stored->setPref('ostatus', 'self', $self);
+        }
+
         // Only save 'attention' and metadata stuff (URLs, tags...) stuff if
         // the activityverb is a POST (since stuff like repeat, favorite etc.
         // reasonably handle notifications themselves.
@@ -3263,4 +3267,27 @@ class Notice extends Managed_DataObject
     public function setPref($namespace, $topic, $data) {
         return Notice_prefs::setData($this, $namespace, $topic, $data);
     }
+
+    public function delPref($namespace, $topic) {
+        return Notice_prefs::setData($this, $namespace, $topic, null);
+    }
+
+    public function getPref($namespace, $topic, $default=null) {
+        // If you want an exception to be thrown, call Notice_prefs::getData directly
+        try {
+            return Notice_prefs::getData($this, $namespace, $topic, $default);
+        } catch (NoResultException $e) {
+            return null;
+        }
+    }
+
+    // The same as getPref but will fall back to common_config value for the same namespace/topic
+    public function getConfigPref($namespace, $topic)
+    {
+        return Notice_prefs::getConfigData($this, $namespace, $topic);
+    }
+
+    public function setPref($namespace, $topic, $data) {
+        return Notice_prefs::setData($this, $namespace, $topic, $data);
+    }
 }