Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5

diff --cc app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 273ebd83f3d0bfb1de10409b76d1274f69bd685b,8019382cd7424968207ad278ebe46139d2d4de86..166c5fdcedb14089373db51d84a1395715683f91
--- 1/app/assets/javascripts/components/features/compose/components/compose_form.jsx
--- 2/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@@ -173,20 -175,31 +173,27 @@@ const ComposeForm = React.createClass(
            <Toggle checked={this.props.private} onChange={this.handleChangeVisibility} />
            <span className='compose-form__label__text'><FormattedMessage id='compose_form.private' defaultMessage='Mark as private' /></span>
          </label>
+        
+         <Motion defaultStyle={{ opacity: 0, height: 0 }}, style={{ opacity: spring((this.props.private || reply_to_other) ? 0 : 100), height: spring((this.props.private || reply_to_other) ? 0 : 39.5) }}>
+             <label className='compose-form__label' style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
+               <span className='compose-form__label__text'><FormattedMessage id='compose_form.privacy_disclaimer' defaultMessage='Warning: Private posts are not encrypted, and could be read or boosted by instances or people who do not respect post privacy. This is not true privacy. Do not post senstive information.' /></span>
+             </label>
+           }
+         </Motion>
  
 -        <Motion defaultStyle={{ opacity: (this.props.private || reply_to_other) ? 0 : 100, height: (this.props.private || reply_to_other) ? 39.5 : 0 }} style={{ opacity: spring((this.props.private || reply_to_other) ? 0 : 100), height: spring((this.props.private || reply_to_other) ? 0 : 39.5) }}>
 -          {({ opacity, height }) =>
 -            <label className='compose-form__label' style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
 -              <Toggle checked={this.props.unlisted} onChange={this.handleChangeListability} />
 -              <span className='compose-form__label__text'><FormattedMessage id='compose_form.unlisted' defaultMessage='Do not display in public timeline' /></span>
 -            </label>
 -          }
 -        </Motion>
 -
 -        <Motion defaultStyle={{ opacity: 0, height: 0 }} style={{ opacity: spring(this.props.media_count === 0 ? 0 : 100), height: spring(this.props.media_count === 0 ? 0 : 39.5) }}>
 -          {({ opacity, height }) =>
 -            <label className='compose-form__label' style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
 -              <Toggle checked={this.props.sensitive} onChange={this.handleChangeSensitivity} />
 -              <span className='compose-form__label__text'><FormattedMessage id='compose_form.sensitive' defaultMessage='Mark media as sensitive' /></span>
 -            </label>
 -          }
 -        </Motion>
 +        <Collapsable isVisible={!(this.props.private || reply_to_other)} fullHeight={39.5}>
 +          <label className='compose-form__label'>
 +            <Toggle checked={this.props.unlisted} onChange={this.handleChangeListability} />
 +            <span className='compose-form__label__text'><FormattedMessage id='compose_form.unlisted' defaultMessage='Do not display in public timeline' /></span>
 +          </label>
 +        </Collapsable>
 +
 +        <Collapsable isVisible={this.props.media_count > 0} fullHeight={39.5}>
 +          <label className='compose-form__label'>
 +            <Toggle checked={this.props.sensitive} onChange={this.handleChangeSensitivity} />
 +            <span className='compose-form__label__text'><FormattedMessage id='compose_form.sensitive' defaultMessage='Mark media as sensitive' /></span>
 +          </label>
 +        </Collapsable>
        </div>
      );
    }