diff --git a/app/actions/views/channel.js b/app/actions/views/channel.js
index be9a12b50..2f129e4ad 100644
--- a/app/actions/views/channel.js
+++ b/app/actions/views/channel.js
@@ -135,10 +135,11 @@ export function handleSelectChannel(channelId) {
     };
 }
 
-export function handlePostDraftChanged(postDraft) {
+export function handlePostDraftChanged(channelId, postDraft) {
     return async (dispatch, getState) => {
         dispatch({
             type: ViewTypes.POST_DRAFT_CHANGED,
+            channelId,
             postDraft
         }, getState);
     };
diff --git a/app/components/post_textbox/post_textbox.js b/app/components/post_textbox/post_textbox.js
index 22b29615f..95e9a7810 100644
--- a/app/components/post_textbox/post_textbox.js
+++ b/app/components/post_textbox/post_textbox.js
@@ -62,9 +62,13 @@ export default class PostTextbox extends React.PureComponent {
         };
 
         this.props.actions.createPost(this.props.teamId, post);
-        this.props.onChangeText('');
+        this.handleTextChange('');
     };
 
+    handleTextChange = (text) => {
+        this.props.onChangeText(this.props.channelId, text);
+    }
+
     render() {
         const theme = this.props.theme;
 
@@ -101,7 +105,7 @@ export default class PostTextbox extends React.PureComponent {
                 <TextInputWithLocalizedPlaceholder
                     ref='input'
                     value={this.props.value}
-                    onChangeText={this.props.onChangeText}
+                    onChangeText={this.handleTextChange}
                     onContentSizeChange={this.handleContentSizeChange}
                     placeholder={placeholder}
                     placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
diff --git a/app/initial_state.js b/app/initial_state.js
index 251c37e24..b1c08cdc1 100644
--- a/app/initial_state.js
+++ b/app/initial_state.js
@@ -269,6 +269,9 @@ const state = {
         rightDrawerRoute: null
     },
     views: {
+        channel: {
+            drafts: {}
+        },
         i18n: {
             locale: ''
         },
diff --git a/app/reducers/views/channel.js b/app/reducers/views/channel.js
index 4347c8afd..ab4b881ce 100644
--- a/app/reducers/views/channel.js
+++ b/app/reducers/views/channel.js
@@ -7,17 +7,30 @@ import {ViewTypes} from 'app/constants';
 
 import {ChannelTypes} from 'service/constants';
 
-function postDraft(state = '', action) {
+function drafts(state = {}, action) {
     switch (action.type) {
-    case ViewTypes.POST_DRAFT_CHANGED:
-        return action.postDraft;
-    case ChannelTypes.SELECT_CHANNEL:
-        return '';
+    case ViewTypes.POST_DRAFT_CHANGED: {
+        return {
+            ...state,
+            [action.channelId]: action.postDraft
+        };
+    }
+    case ChannelTypes.SELECT_CHANNEL: {
+        let data = {...state};
+        if (!data[action.data]) {
+            data = {
+                ...state,
+                [action.data]: ''
+            };
+        }
+
+        return data;
+    }
     default:
         return state;
     }
 }
 
 export default combineReducers({
-    postDraft
+    drafts
 });
diff --git a/app/scenes/channel/channel.js b/app/scenes/channel/channel.js
index ed19e3041..f303b7890 100644
--- a/app/scenes/channel/channel.js
+++ b/app/scenes/channel/channel.js
@@ -33,7 +33,7 @@ export default class Channel extends React.PureComponent {
         }).isRequired,
         currentTeam: React.PropTypes.object,
         currentChannel: React.PropTypes.object,
-        postDraft: React.PropTypes.string.isRequired,
+        drafts: React.PropTypes.object.isRequired,
         theme: React.PropTypes.object.isRequired,
         subscribeToHeaderEvent: React.PropTypes.func,
         unsubscribeFromHeaderEvent: React.PropTypes.func
@@ -128,7 +128,7 @@ export default class Channel extends React.PureComponent {
                 <ChannelPostList channel={currentChannel}/>
                 <PostTextbox
                     ref={this.attachPostTextbox}
-                    value={this.props.postDraft}
+                    value={this.props.drafts[this.props.currentChannel.id]}
                     teamId={teamId}
                     channelId={currentChannel.id}
                     onChangeText={this.props.actions.handlePostDraftChanged}