diff --git a/ReactNativeClient/src/base-model.js b/ReactNativeClient/src/base-model.js
index a4bbcb894..6e0cb0fa0 100644
--- a/ReactNativeClient/src/base-model.js
+++ b/ReactNativeClient/src/base-model.js
@@ -13,6 +13,13 @@ class BaseModel {
 		return false;
 	}
 
+	static byId(items, id) {
+		for (let i = 0; i < items.length; i++) {
+			if (items[i].id == id) return items[i];
+		}
+		return null;
+	}
+
 	static save(o) {
 		let isNew = !o.id;
 		let query = '';
diff --git a/ReactNativeClient/src/components/create-note-button.js b/ReactNativeClient/src/components/create-note-button.js
deleted file mode 100644
index 99b2b2d78..000000000
--- a/ReactNativeClient/src/components/create-note-button.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// import React, { Component } from 'react';
-// import { connect } from 'react-redux'
-// import { Button } from 'react-native';
-// import { _ } from 'src/locale.js';
-
-// class CreateNoteButtonComponent extends Component {
-
-// 	render() {
-// 		return <Button onPress={this.props.onPress} title={_("Create note")} />
-// 	}
-
-// }
-
-// const CreateNoteButton = connect(
-// 	(state) => {
-// 		return {
-// 			selectedNoteId: selectedNoteId,
-// 		};
-// 	},
-// 	(dispatch) => {
-// 		return {
-// 			onPress: function() {
-// 				dispatch({
-// 					type: 'VIEW_NOTE'
-// 				});
-// 			}
-// 		}
-// 	}
-// )(CreateNoteButtonComponent)
-
-// export { CreateNoteButton };
\ No newline at end of file
diff --git a/ReactNativeClient/src/components/item-list.js b/ReactNativeClient/src/components/item-list.js
index 84d75c6b1..1c732e054 100644
--- a/ReactNativeClient/src/components/item-list.js
+++ b/ReactNativeClient/src/components/item-list.js
@@ -13,13 +13,13 @@ class ItemListComponent extends Component {
 	}
 
 	componentWillMount() {
-		const newDataSource = this.state.dataSource.cloneWithRows(this.props.notes);
+		const newDataSource = this.state.dataSource.cloneWithRows(this.props.items);
 		this.state = { dataSource: newDataSource };
 	}
 
 	componentWillReceiveProps(newProps) {
 		// https://stackoverflow.com/questions/38186114/react-native-redux-and-listview
-		this.setState({ dataSource: this.state.dataSource.cloneWithRows(newProps.notes) });
+		this.setState({ dataSource: this.state.dataSource.cloneWithRows(newProps.items) });
 	}
 
 	render() {
@@ -45,21 +45,4 @@ class ItemListComponent extends Component {
 	}
 }
 
-const ItemList = connect(
-	(state) => {
-		return { notes: state.notes };
-	},
-	(dispatch) => {
-		return {
-			onItemClick: (noteId) => {
-				dispatch({
-					type: 'Navigation/NAVIGATE',
-					routeName: 'Note',
-					noteId: noteId,
-				});
-			}
-		}
-	}
-)(ItemListComponent)
-
-export { ItemList };
\ No newline at end of file
+export { ItemListComponent };
\ No newline at end of file
diff --git a/ReactNativeClient/src/components/note-list.js b/ReactNativeClient/src/components/note-list.js
new file mode 100644
index 000000000..b491878bf
--- /dev/null
+++ b/ReactNativeClient/src/components/note-list.js
@@ -0,0 +1,27 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux'
+import { ListView, Text, TouchableHighlight } from 'react-native';
+import { Log } from 'src/log.js';
+import { ItemListComponent } from 'src/components/item-list.js';
+import { _ } from 'src/locale.js';
+
+class NoteListComponent extends ItemListComponent {}
+
+const NoteList = connect(
+	(state) => {
+		return { items: state.notes };
+	},
+	(dispatch) => {
+		return {
+			onItemClick: (noteId) => {
+				dispatch({
+					type: 'Navigation/NAVIGATE',
+					routeName: 'Note',
+					noteId: noteId,
+				});
+			}
+		}
+	}
+)(NoteListComponent)
+
+export { NoteList };
\ No newline at end of file
diff --git a/ReactNativeClient/src/components/screens/folder.js b/ReactNativeClient/src/components/screens/folder.js
new file mode 100644
index 000000000..fb473af20
--- /dev/null
+++ b/ReactNativeClient/src/components/screens/folder.js
@@ -0,0 +1,64 @@
+import React, { Component } from 'react';
+import { View, Button, TextInput } from 'react-native';
+import { connect } from 'react-redux'
+import { Log } from 'src/log.js'
+import { Folder } from 'src/models/folder.js'
+
+class FolderScreenComponent extends React.Component {
+	
+	static navigationOptions = {
+		title: 'Folder',
+	};
+
+	constructor() {
+		super();
+		this.state = { folder: Folder.newFolder() }
+	}
+
+	componentWillMount() {
+		this.setState({ folder: this.props.folder });
+	}
+
+	folderComponent_change = (propName, propValue) => {
+		this.setState((prevState, props) => {
+			let folder = Object.assign({}, prevState.folder);
+			folder[propName] = propValue;
+			return { folder: folder }
+		});
+	}
+
+	title_changeText = (text) => {
+		this.folderComponent_change('title', text);
+	}
+
+	saveFolderButton_press = () => {
+		Folder.save(this.state.folder).then((folder) => {
+			this.props.dispatch({
+				type: 'FOLDERS_UPDATE_ONE',
+				folder: folder,
+			});
+		}).catch((error) => {
+			Log.warn('Cannot save folder', error);
+		});
+	}
+
+	render() {
+		return (
+			<View style={{flex: 1}}>
+				<TextInput value={this.state.folder.title} onChangeText={this.title_changeText} />
+				<Button title="Save folder" onPress={this.saveFolderButton_press} />
+			</View>
+		);
+	}
+
+}
+
+const FolderScreen = connect(
+	(state) => {
+		return {
+			folder: state.selectedFolderId ? Folder.byId(state.folders, state.selectedFolderId) : Folder.newFolder(),
+		};
+	}
+)(FolderScreenComponent)
+
+export { FolderScreen };
\ No newline at end of file
diff --git a/ReactNativeClient/src/components/screens/note.js b/ReactNativeClient/src/components/screens/note.js
index 11f9cfd27..5632d9128 100644
--- a/ReactNativeClient/src/components/screens/note.js
+++ b/ReactNativeClient/src/components/screens/note.js
@@ -61,7 +61,7 @@ class NoteScreenComponent extends React.Component {
 const NoteScreen = connect(
 	(state) => {
 		return {
-			note: state.selectedNoteId ? Note.noteById(state.notes, state.selectedNoteId) : Note.newNote(),
+			note: state.selectedNoteId ? Note.byId(state.notes, state.selectedNoteId) : Note.newNote(),
 		};
 	}
 )(NoteScreenComponent)
diff --git a/ReactNativeClient/src/components/screens/notes.js b/ReactNativeClient/src/components/screens/notes.js
index cf5b7f766..9217753cf 100644
--- a/ReactNativeClient/src/components/screens/notes.js
+++ b/ReactNativeClient/src/components/screens/notes.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
-import { View, Button } from 'react-native';
+import { View, Button, Picker } from 'react-native';
 import { connect } from 'react-redux'
 import { Log } from 'src/log.js'
-import { ItemList } from 'src/components/item-list.js'
+import { NoteList } from 'src/components/note-list.js'
 
 class NotesScreenComponent extends React.Component {
 	
@@ -17,6 +17,13 @@ class NotesScreenComponent extends React.Component {
 		});
 	}
 
+	createFolderButton_press = () => {
+		this.props.dispatch({
+			type: 'Navigation/NAVIGATE',
+			routeName: 'Folder',
+		});
+	}
+
 	loginButton_press = () => {
 		this.props.dispatch({
 			type: 'Navigation/NAVIGATE',
@@ -32,9 +39,10 @@ class NotesScreenComponent extends React.Component {
 		const { navigate } = this.props.navigation;
 		return (
 			<View style={{flex: 1}}>
-				<ItemList style={{flex: 1}}/>
+				<NoteList style={{flex: 1}}/>
 				<View style={{flexDirection: 'row'}}>
 					<Button title="Create note" onPress={this.createNoteButton_press} />
+					<Button title="Create folder" onPress={this.createFolderButton_press} />
 					<Button title="Login" onPress={this.loginButton_press} />
 					<Button title="Sync" onPress={this.syncButton_press} />
 				</View>
@@ -45,7 +53,9 @@ class NotesScreenComponent extends React.Component {
 
 const NotesScreen = connect(
 	(state) => {
-		return {};
+		return {
+			folders: state.folders
+		};
 	}
 )(NotesScreenComponent)
 
diff --git a/ReactNativeClient/src/models/folder.js b/ReactNativeClient/src/models/folder.js
new file mode 100644
index 000000000..ce04b26ce
--- /dev/null
+++ b/ReactNativeClient/src/models/folder.js
@@ -0,0 +1,33 @@
+import { BaseModel } from 'src/base-model.js';
+import { Log } from 'src/log.js';
+
+class Folder extends BaseModel {
+
+	static tableName() {
+		return 'folders';
+	}
+
+	static useUuid() {
+		return true;
+	}
+
+	static newFolder() {
+		return {
+			id: null,
+			title: '',
+		}
+	}
+
+	static all() {
+		return this.db().selectAll('SELECT * FROM folders').then((r) => {
+			let output = [];
+			for (let i = 0; i < r.rows.length; i++) {
+				output.push(r.rows.item(i));
+			}
+			return output;
+		});
+	}
+
+}
+
+export { Folder };
\ No newline at end of file
diff --git a/ReactNativeClient/src/models/note.js b/ReactNativeClient/src/models/note.js
index 3010d4fcb..02f694a27 100644
--- a/ReactNativeClient/src/models/note.js
+++ b/ReactNativeClient/src/models/note.js
@@ -11,13 +11,6 @@ class Note extends BaseModel {
 		return true;
 	}
 
-	static noteById(notes, id) {
-		for (let i = 0; i < notes.length; i++) {
-			if (notes[i].id == id) return notes[i];
-		}
-		return null;
-	}
-
 	static newNote() {
 		return {
 			id: null,
diff --git a/ReactNativeClient/src/root.js b/ReactNativeClient/src/root.js
index 95a1eba2a..1a43eb128 100644
--- a/ReactNativeClient/src/root.js
+++ b/ReactNativeClient/src/root.js
@@ -13,13 +13,21 @@ import { Registry } from 'src/registry.js'
 import { ItemList } from 'src/components/item-list.js'
 import { NotesScreen } from 'src/components/screens/notes.js'
 import { NoteScreen } from 'src/components/screens/note.js'
+import { FolderScreen } from 'src/components/screens/folder.js'
 import { LoginScreen } from 'src/components/screens/login.js'
 import { Setting } from 'src/models/setting.js'
 
 let defaultState = {
 	defaultText: 'bla',
 	notes: [],
+	folders: [
+		{ id: 'abcdabcdabcdabcdabcdabcdabcdab01', title: "un" },
+		{ id: 'abcdabcdabcdabcdabcdabcdabcdab02', title: "deux" },
+		{ id: 'abcdabcdabcdabcdabcdabcdabcdab03', title: "trois" },
+		{ id: 'abcdabcdabcdabcdabcdabcdabcdab04', title: "quatre" },
+	],
 	selectedNoteId: null,
+	selectedFolderId: null,
 };
 
 const reducer = (state = defaultState, action) => {
@@ -62,7 +70,7 @@ const reducer = (state = defaultState, action) => {
 		case 'NOTES_UPDATE_ONE':
 
 			let newNotes = state.notes.splice(0);
-			let found = false;
+			var found = false;
 			for (let i = 0; i < newNotes.length; i++) {
 				let n = newNotes[i];
 				if (n.id == action.note.id) {
@@ -78,6 +86,25 @@ const reducer = (state = defaultState, action) => {
 			newState.notes = newNotes;
 			break;
 
+		case 'FOLDERS_UPDATE_ONE':
+
+			let newFolders = state.folders.splice(0);
+			var found = false;
+			for (let i = 0; i < newFolders.length; i++) {
+				let n = newFolders[i];
+				if (n.id == action.folder.id) {
+					newFolders[i] = action.folder;
+					found = true;
+					break;
+				}
+			}
+
+			if (!found) newFolders.push(action.folder);
+
+			newState = Object.assign({}, state);
+			newState.folders = newFolders;
+			break;
+
 	}
 
 	return newState;
@@ -88,6 +115,7 @@ let store = createStore(reducer);
 const AppNavigator = StackNavigator({
 	Notes: {screen: NotesScreen},
 	Note: {screen: NoteScreen},
+	Folder: {screen: FolderScreen},
 	Login: {screen: LoginScreen},
 });
 
diff --git a/ReactNativeClient/src/web-api.js b/ReactNativeClient/src/web-api.js
index db66872e0..96eedf578 100644
--- a/ReactNativeClient/src/web-api.js
+++ b/ReactNativeClient/src/web-api.js
@@ -53,13 +53,11 @@ class WebApi {
 				let responseClone = response.clone();
 				return response.json().then(function(data) {
 					if (data && data.error) {
-						let e = new Error(data.error);
-						reject(e);
+						reject(new Error(data.error));
 					} else {
 						resolve(data);
 					}
-				})
-				.catch(function(error) {
+				}).catch(function(error) {
 					responseClone.text().then(function(text) {
 						reject(new Error('Cannot parse JSON: ' + text));
 					});