diff --git a/__tests__/tests/components/GithubHtmlView.js b/__tests__/tests/components/GithubHtmlView.js
new file mode 100644
index 000000000..04fe79d8c
--- /dev/null
+++ b/__tests__/tests/components/GithubHtmlView.js
@@ -0,0 +1,77 @@
+import React from 'react';
+import { Text } from 'react-native';
+import renderer from 'react-test-renderer';
+import { GithubHtmlView } from 'components';
+import { Icon } from 'react-native-elements';
+
+describe('<GithubHtmlView />', () => {
+  it('correctly renders <details/> tag in GithubHtmlView with correct icon', () => {
+    const sourceHtml = `
+      <details>
+        <summary>title</summary>
+        <div>description</div>
+      </details> 
+    `;
+
+    const inst = renderer.create(
+      <GithubHtmlView source={sourceHtml} onLinkPress={() => 0} />
+    );
+
+    expect(inst.root.findByType(Icon).props.name).toEqual('triangle-right');
+  });
+
+  it('if <summary/> tag contains a single text node, we shoud prettify it', () => {
+    const sourceHtml = `
+      <details>
+        <summary>    
+              make some space and line break here...     
+        
+        </summary>
+        <div>description</div>
+      </details> 
+    `;
+
+    const inst = renderer.create(
+      <GithubHtmlView source={sourceHtml} onLinkPress={() => 0} />
+    );
+
+    expect(
+      !!inst.root
+        .findAllByType(Text)
+        .find(
+          e => e.props.children === 'make some space and line break here...'
+        )
+    ).toBe(true);
+  });
+
+  it('if there is no <summary/> tag, we should do fallback render which contains no icon', () => {
+    const sourceHtml = `
+      <details>
+        <div>no summary here!!</div>
+      </details> 
+    `;
+
+    const inst = renderer.create(
+      <GithubHtmlView source={sourceHtml} onLinkPress={() => 0} />
+    );
+
+    expect(inst.root.findAllByType(Icon).length).toBe(0);
+  });
+
+  it('if <summary/> contain nested tags, should still be rendered without exception', () => {
+    const sourceHtml = `
+      <details>
+        <summary>
+          abcde <div>test</div> fg
+        </summary>
+        <div>no summary here!!</div>
+      </details> 
+    `;
+
+    const inst = renderer.create(
+      <GithubHtmlView source={sourceHtml} onLinkPress={() => 0} />
+    );
+
+    expect(inst.root.findByType(Icon).props.name).toEqual('triangle-right');
+  });
+});
diff --git a/src/components/github-htmlview.component.js b/src/components/github-htmlview.component.js
index 0b9b775b1..14ea0c241 100644
--- a/src/components/github-htmlview.component.js
+++ b/src/components/github-htmlview.component.js
@@ -5,6 +5,7 @@ import { TableWrapper, Table, Cell } from 'react-native-table-component';
 import SyntaxHighlighter from 'react-native-syntax-highlighter';
 import { github as GithubStyle } from 'react-syntax-highlighter/dist/styles';
 import entities from 'entities';
+import { Icon } from 'react-native-elements';
 
 import { ImageZoom, ToggleView } from 'components';
 import { colors, fonts, normalize } from 'config';
@@ -386,6 +387,53 @@ export class GithubHtmlView extends Component {
             </Text>
           );
         },
+        details: (node, index, siblings, parent, defaultRenderer) => {
+          const summaryTagIdx = node.children.findIndex(
+            n => n.type === 'tag' && n.name === 'summary'
+          );
+          const summaryTag = node.children[summaryTagIdx];
+
+          if (!summaryTag) {
+            // we have a details tag without summary, rollback to default render
+            return <View>{defaultRenderer(node.children, node)}</View>;
+          }
+
+          const childrenWithoutSummary = [...node.children]; // don't touch the original data
+
+          childrenWithoutSummary.splice(summaryTagIdx, 1);
+
+          const renderSummary = tag => {
+            if (tag.children.length === 1 && tag.children[0].type === 'text') {
+              // if we only have one text child, make it prettier
+              // by removing line break and triming space
+              return (
+                <Text>
+                  {tag.children[0].data.replace(/\s\s+/g, ' ').trim()}
+                </Text>
+              );
+            }
+
+            return defaultRenderer(tag.children, tag);
+          };
+
+          return (
+            <ToggleView
+              renderTouchable={collapsed => (
+                <View
+                  style={{ flexDirection: 'row', alignItems: 'flex-start' }}
+                >
+                  <Icon
+                    type="octicon"
+                    name={collapsed ? 'triangle-right' : 'triangle-down'}
+                  />
+                  <View style={{ flex: 1 }}>{renderSummary(summaryTag)}</View>
+                </View>
+              )}
+            >
+              {defaultRenderer(childrenWithoutSummary, node)}
+            </ToggleView>
+          );
+        },
       };
 
       if (_node.type === 'text') {
diff --git a/src/components/toggle-view.component.js b/src/components/toggle-view.component.js
index 03797a6b2..021637906 100644
--- a/src/components/toggle-view.component.js
+++ b/src/components/toggle-view.component.js
@@ -6,6 +6,7 @@ export class ToggleView extends Component {
   props: {
     children: any,
     TouchableView: any,
+    renderTouchable: Function,
   };
 
   state: {
@@ -28,7 +29,9 @@ export class ToggleView extends Component {
     return (
       <View>
         <TouchableOpacity onPress={() => this._toggle()}>
-          {this.props.TouchableView}
+          {this.props.renderTouchable
+            ? this.props.renderTouchable(this.state.collapsed)
+            : this.props.TouchableView}
         </TouchableOpacity>
         <Collapsible collapsed={this.state.collapsed}>
           {this.props.children}