diff --git a/lib/noticelist.php b/lib/noticelist.php
index d6ffc9ca9c..21cec528ff 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -212,7 +212,6 @@ class NoticeListItem extends Widget
             $this->out->elementStart('div', 'notice-options');
             $this->showFaveForm();
             $this->showReplyLink();
-            $this->showForwardForm();
             $this->showDeleteLink();
             $this->out->elementEnd('div');
         }
@@ -531,26 +530,6 @@ class NoticeListItem extends Widget
         }
     }
 
-    /**
-     * show the form to forward a notice
-     *
-     * @return void
-     */
-
-    function showForwardForm()
-    {
-        $user = common_current_user();
-        if ($user && $user->id != $this->notice->profile_id) {
-            $profile = $user->getProfile();
-            if ($profile->hasForwarded($this->notice->id)) {
-                $this->out->text(_('Forwarded'));
-            } else {
-                $ff = new ForwardForm($this->out, $this->notice);
-                $ff->show();
-            }
-        }
-    }
-
     /**
      * if the user is the author, let them delete the notice
      *
diff --git a/lib/forwardform.php b/plugins/Repeat/forwardform.php
similarity index 100%
rename from lib/forwardform.php
rename to plugins/Repeat/forwardform.php