diff --git a/res/drawable/ic_menu_friendslist.png b/res/drawable/ic_menu_friendslist.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ec6b1aae8df6a7e0c5a0438a6fefcb9765b14af
Binary files /dev/null and b/res/drawable/ic_menu_friendslist.png differ
diff --git a/res/menu/menu1.xml b/res/menu/menu1.xml
index b7857aa382db4249e80dc28624850312ec13a796..565b164970193e812d5fea26495818f30c7c537e 100755
--- a/res/menu/menu1.xml
+++ b/res/menu/menu1.xml
@@ -7,6 +7,10 @@
           android:id="@+id/menu_stop"
           android:icon="@android:drawable/ic_menu_close_clear_cancel" >
     </item>
+    <item android:title="Address Book"
+          android:id="@+id/menu_addressbook"
+          android:icon="@drawable/ic_menu_friendslist" >
+    </item>
     <item android:title="I2P Home"
           android:id="@+id/menu_home"
           android:icon="@drawable/ic_menu_home" >
diff --git a/src/net/i2p/android/router/activity/AddressbookActivity.java b/src/net/i2p/android/router/activity/AddressbookActivity.java
index 6eee259bd21c9d676fea3e3a4c5d3b76a9a2e4fa..2923869d491029a04f81d4da8484cbff6367fc6f 100644
--- a/src/net/i2p/android/router/activity/AddressbookActivity.java
+++ b/src/net/i2p/android/router/activity/AddressbookActivity.java
@@ -35,9 +35,9 @@ public class AddressbookActivity extends ListActivity {
 
         // set the header
         TextView tv = (TextView) getLayoutInflater().inflate(R.layout.addressbook_header, null);
-        tv.setText(names.size() + " hosts in address book. Start typing to filter");
+        tv.setText(names.size() + " hosts in address book. Start typing to filter.");
         ListView lv = getListView();
-        lv.addHeaderView(tv);
+        lv.addHeaderView(tv, "", false);
         lv.setTextFilterEnabled(true);
 
         // set the list
diff --git a/src/net/i2p/android/router/activity/I2PActivityBase.java b/src/net/i2p/android/router/activity/I2PActivityBase.java
index d1e86ca4ce5a3d9b9004ec1a91615d902558a925..e9443da8972ba21c87725128267f94bfd79ffe2b 100644
--- a/src/net/i2p/android/router/activity/I2PActivityBase.java
+++ b/src/net/i2p/android/router/activity/I2PActivityBase.java
@@ -146,6 +146,11 @@ public abstract class I2PActivityBase extends Activity {
         home.setVisible(showHome);
         home.setEnabled(showHome);
 
+        boolean showAddressbook = (this instanceof WebActivity);
+        MenuItem addressbook = menu.findItem(R.id.menu_addressbook);
+        addressbook.setVisible(showAddressbook);
+        addressbook.setEnabled(showAddressbook);
+
         return super.onPrepareOptionsMenu(menu);
     }
 
@@ -162,6 +167,11 @@ public abstract class I2PActivityBase extends Activity {
             startActivity(i2);
             return true;
 
+        case R.id.menu_addressbook:
+            Intent i3 = new Intent(I2PActivityBase.this, AddressbookActivity.class);
+            startActivity(i3);
+            return true;
+
         case R.id.menu_start:
         case R.id.menu_stop:
         default: