diff --git a/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java b/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
index f7ba57da9..673b33430 100644
--- a/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
+++ b/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
@@ -185,7 +185,7 @@ public interface DatabaseComponent {
 	 * Returns the ID of the inbox group for the given contact, or null if no
 	 * inbox group has been set.
 	 */
-	GroupId getInboxGroup(ContactId c) throws DbException;
+	GroupId getInboxGroupId(ContactId c) throws DbException;
 
 	/**
 	 * Returns the headers of all messages in the inbox group for the given
diff --git a/briar-core/src/net/sf/briar/db/Database.java b/briar-core/src/net/sf/briar/db/Database.java
index 2d47642b2..9fc087254 100644
--- a/briar-core/src/net/sf/briar/db/Database.java
+++ b/briar-core/src/net/sf/briar/db/Database.java
@@ -293,7 +293,7 @@ interface Database<T> {
 	 * <p>
 	 * Locking: contact read, subscription read.
 	 */
-	GroupId getInboxGroup(T txn, ContactId c) throws DbException;
+	GroupId getInboxGroupId(T txn, ContactId c) throws DbException;
 
 	/**
 	 * Returns the headers of all messages in the inbox group for the given
diff --git a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
index f49b984ff..039916dae 100644
--- a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
@@ -946,7 +946,7 @@ DatabaseCleaner.Callback {
 		}
 	}
 
-	public GroupId getInboxGroup(ContactId c) throws DbException {
+	public GroupId getInboxGroupId(ContactId c) throws DbException {
 		contactLock.readLock().lock();
 		try {
 			subscriptionLock.readLock().lock();
@@ -955,7 +955,7 @@ DatabaseCleaner.Callback {
 				try {
 					if(!db.containsContact(txn, c))
 						throw new NoSuchContactException();
-					GroupId inbox = db.getInboxGroup(txn, c);
+					GroupId inbox = db.getInboxGroupId(txn, c);
 					db.commitTransaction(txn);
 					return inbox;
 				} catch(DbException e) {
diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
index 9c07177e3..8fb1a905b 100644
--- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java
+++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
@@ -1351,7 +1351,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	public GroupId getInboxGroup(Connection txn, ContactId c)
+	public GroupId getInboxGroupId(Connection txn, ContactId c)
 			throws DbException {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
diff --git a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
index 9c4956a67..47a9fc7a1 100644
--- a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
+++ b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
@@ -390,7 +390,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
 		} catch(NoSuchContactException expected) {}
 
 		try {
-			db.getInboxGroup(contactId);
+			db.getInboxGroupId(contactId);
 			fail();
 		} catch(NoSuchContactException expected) {}